Merge branch 'master' of https://github.com/DarthAffe/StableDiffusion.NET

Small naming changes in sd.cpp

Header/stable-diffusion.h

@@ -65,11 +65,10 @@ enum scheduler_t {
 };
 
 enum prediction_t {
-    DEFAULT_PRED,
     EPS_PRED,
     V_PRED,
     EDM_V_PRED,
-    SD3_FLOW_PRED,
+    FLOW_PRED,
     FLUX_FLOW_PRED,
     FLUX2_FLOW_PRED,
     PREDICTION_COUNT
@@ -288,7 +287,7 @@ typedef void (*sd_preview_cb_t)(int step, int frame_count, sd_image_t* frames, b
 SD_API void sd_set_log_callback(sd_log_cb_t sd_log_cb, void* data);
 SD_API void sd_set_progress_callback(sd_progress_cb_t cb, void* data);
 SD_API void sd_set_preview_callback(sd_preview_cb_t cb, enum preview_t mode, int interval, bool denoised, bool noisy, void* data);
-SD_API int32_t get_num_physical_cores();
+SD_API int32_t sd_get_num_physical_cores();
 SD_API const char* sd_get_system_info();
 
 SD_API const char* sd_type_name(enum sd_type_t type);
@@ -358,4 +357,4 @@ SD_API bool preprocess_canny(sd_image_t image,
 }
 #endif
 
-#endif  // __STABLE_DIFFUSION_H__
+#endif  // __STABLE_DIFFUSION_H__

StableDiffusion.NET/Enums/Prediction.cs

@@ -2,11 +2,11 @@
 
 public enum Prediction
 {
-    Default,
     EPS,
     V,
     EDM_V,
-    SD3Flow,
+    Flow,
     FluxFlow,
-    Flux2Flow
+    Flux2Flow,
+    Default
 }

StableDiffusion.NET/Native/Native.cs

@@ -222,8 +222,8 @@ internal unsafe partial class Native
     [LibraryImport(LIB_NAME, EntryPoint = "sd_set_preview_callback")]
     internal static partial void sd_set_preview_callback(sd_preview_cb_t? cb, preview_t mode, int interval, [MarshalAs(UnmanagedType.I1)] bool denoised, [MarshalAs(UnmanagedType.I1)] bool noisy, void* data);
 
-    [LibraryImport(LIB_NAME, EntryPoint = "get_num_physical_cores")]
-    internal static partial int32_t get_num_physical_cores();
+    [LibraryImport(LIB_NAME, EntryPoint = "sd_get_num_physical_cores")]
+    internal static partial int32_t sd_get_num_physical_cores();
 
     [LibraryImport(LIB_NAME, EntryPoint = "sd_get_system_info")]
     [return: MarshalAs(UnmanagedType.LPStr)]

StableDiffusion.NET/StableDiffusionCpp.cs

@@ -60,7 +60,7 @@ public static unsafe class StableDiffusionCpp
 
     public static string GetSystemInfo() => Native.sd_get_system_info();
 
-    public static int GetNumPhysicalCores() => Native.get_num_physical_cores();
+    public static int GetNumPhysicalCores() => Native.sd_get_num_physical_cores();
 
     public static Image<ColorRGB> PreprocessCanny(CannyParameter parameter)
     {