Merge pull request #68 from DarthAffe/sd.cpp_update

Updated sd.cpp to 43a70e8

Author: DarthAffe

Header/stable-diffusion.h

@@ -150,6 +150,11 @@ typedef struct {
     float rel_size_y;
 } sd_tiling_params_t;
 
+typedef struct {
+    const char* name;
+    const char* path;
+} sd_embedding_t;
+
 typedef struct {
     const char* model_path;
     const char* clip_l_path;
@@ -164,7 +169,8 @@ typedef struct {
     const char* taesd_path;
     const char* control_net_path;
     const char* lora_model_dir;
-    const char* embedding_dir;
+    const sd_embedding_t* embeddings;
+    uint32_t embedding_count;
     const char* photo_maker_path;
     const char* tensor_type_rules;
     bool vae_decode_only;
@@ -219,6 +225,8 @@ typedef struct {
     int sample_steps;
     float eta;
     int shifted_timestep;
+    float* custom_sigmas;
+    int custom_sigmas_count;
 } sd_sample_params_t;
 
 typedef struct {
@@ -236,6 +244,14 @@ typedef struct {
 } sd_easycache_params_t;
 
 typedef struct {
+    bool is_high_noise;
+    float multiplier;
+    const char* path;
+} sd_lora_t;
+
+typedef struct {
+    const sd_lora_t* loras;
+    uint32_t lora_count;
     const char* prompt;
     const char* negative_prompt;
     int clip_skip;
@@ -259,6 +275,8 @@ typedef struct {
 } sd_img_gen_params_t;
 
 typedef struct {
+    const sd_lora_t* loras;
+    uint32_t lora_count;
     const char* prompt;
     const char* negative_prompt;
     int clip_skip;
@@ -331,7 +349,8 @@ typedef struct upscaler_ctx_t upscaler_ctx_t;
 SD_API upscaler_ctx_t* new_upscaler_ctx(const char* esrgan_path,
                                         bool offload_params_to_cpu,
                                         bool direct,
-                                        int n_threads);
+                                        int n_threads,
+                                        int tile_size);
 SD_API void free_upscaler_ctx(upscaler_ctx_t* upscaler_ctx);
 
 SD_API sd_image_t upscale(upscaler_ctx_t* upscaler_ctx,
@@ -353,8 +372,11 @@ SD_API bool preprocess_canny(sd_image_t image,
                              float strong,
                              bool inverse);
 
+SD_API const char* sd_commit(void);
+SD_API const char* sd_version(void);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif  // __STABLE_DIFFUSION_H__
+#endif  // __STABLE_DIFFUSION_H__

StableDiffusion.NET/Models/Parameter/DiffusionModelParameter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace StableDiffusion.NET;
@@ -24,8 +25,11 @@ public sealed class DiffusionModelParameter
     /// <summary>
     /// path to embeddings
     /// </summary>
+    [Obsolete("Use Embeddings instead")]
     public string EmbeddingsDirectory { get; set; } = string.Empty;
 
+    public List<Embedding> Embeddings { get; } = [];
+
     /// <summary>
     /// path to control net model
     /// </summary>

StableDiffusion.NET/Models/Parameter/Embedding.cs

@@ -0,0 +1,18 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace StableDiffusion.NET;
+
+public sealed class Embedding
+{
+    public required string Name { get; init; }
+    public required string Path { get; init; }
+
+    public Embedding() { }
+
+    [SetsRequiredMembers]
+    public Embedding(string name, string path)
+    {
+        this.Name = name;
+        this.Path = path;
+    }
+}

StableDiffusion.NET/Models/Parameter/Extensions/DiffusionModelBuilderExtension.cs

@@ -37,6 +37,7 @@ public static DiffusionModelParameter WithLoraSupport(this DiffusionModelParamet
         return parameter;
     }
 
+    [Obsolete("Use WithEmbedding instead")]
     public static DiffusionModelParameter WithEmbeddingSupport(this DiffusionModelParameter parameter, string embeddingsDirectory)
     {
         ArgumentNullException.ThrowIfNull(embeddingsDirectory);
@@ -46,6 +47,15 @@ public static DiffusionModelParameter WithEmbeddingSupport(this DiffusionModelPa
         return parameter;
     }
 
+    public static DiffusionModelParameter WithEmbedding(this DiffusionModelParameter parameter, Embedding embedding)
+    {
+        ArgumentNullException.ThrowIfNull(embedding);
+
+        parameter.Embeddings.Add(embedding);
+
+        return parameter;
+    }
+
     public static DiffusionModelParameter WithControlNet(this DiffusionModelParameter parameter, string controlNetPath)
     {
         ArgumentNullException.ThrowIfNull(controlNetPath);

StableDiffusion.NET/Models/Parameter/ImageGenerationParameter.cs

@@ -1,4 +1,5 @@
-using HPPH;
+using System.Collections.Generic;
+using HPPH;
 using JetBrains.Annotations;
 
 namespace StableDiffusion.NET;
@@ -61,6 +62,8 @@ public sealed class ImageGenerationParameter
 
     public EasyCache EasyCache { get; } = new();
 
+    public List<Lora> Loras { get; } = [];
+
     #endregion
 
     public static ImageGenerationParameter Create() => new();

StableDiffusion.NET/Models/Parameter/Lora.cs

@@ -0,0 +1,18 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace StableDiffusion.NET;
+
+public sealed class Lora
+{
+    public bool IsHighNoise { get; set; } = false;
+    public float Multiplier { get; set; } = 1f;
+    public required string Path { get; init; }
+
+    public Lora() { }
+
+    [SetsRequiredMembers]
+    public Lora(string path)
+    {
+        this.Path = path;
+    }
+}

StableDiffusion.NET/Models/Parameter/SampleParameter.cs

@@ -26,5 +26,7 @@ public sealed class SampleParameter
 
     public int ShiftedTimestep { get; set; } = 0;
 
+    public float[] CustomSigmas { get; set; } = [];
+
     internal SampleParameter() { }
 }

StableDiffusion.NET/Models/Parameter/UpscaleModelParameter.cs

@@ -24,5 +24,7 @@ public sealed class UpscaleModelParameter
     /// </summary>
     public bool ConvDirect { get; set; } = false;
 
+    public int TileSize { get; set; } = 128;
+
     public static UpscaleModelParameter Create() => new();
 }

StableDiffusion.NET/Models/Parameter/VideoGenerationParameter.cs

@@ -1,5 +1,6 @@
 using HPPH;
 using JetBrains.Annotations;
+using System.Collections.Generic;
 
 namespace StableDiffusion.NET;
 
@@ -40,6 +41,8 @@ public sealed class VideoGenerationParameter
 
     public EasyCache EasyCache { get; } = new();
 
+    public List<Lora> Loras { get; } = [];
+
     #endregion
 
     public static VideoGenerationParameter Create() => new();

StableDiffusion.NET/Models/UpscaleModel.cs

@@ -41,7 +41,8 @@ private void Initialize()
         _ctx = Native.new_upscaler_ctx(ModelParameter.ModelPath,
                                        ModelParameter.OffloadParamsToCPU,
                                        ModelParameter.ConvDirect,
-                                       ModelParameter.ThreadCount);
+                                       ModelParameter.ThreadCount,
+                                       ModelParameter.TileSize);
 
         if (_ctx == null) throw new NullReferenceException("Failed to initialize upscale-model.");
     }