Merge branch 'dev'

Author: william-murray1204

README.md

@@ -275,7 +275,7 @@ def progress_callback(step: int, steps: int, time: float):
     print("Completed step: {} of {}".format(step, steps))
 
 def preview_callback(step: int, images: list[Image.Image], is_noisy: bool):
-    images[0].save(f"{PREVIEW_OUTPUT_DIR}/{step}.png")
+    images[0].save(f"preview/{step}.png")
 
 stable_diffusion = StableDiffusion(
       model_path="../models/v1-5-pruned-emaonly.safetensors",
@@ -731,19 +731,20 @@ stable_diffusion.convert(
 
 ---
 
-### <u>Listing GGML model/prediction/RNG types, sample/preview methods and schedulers</u>
+### <u>Listing LoRA apply modes, GGML model/prediction/RNG types, sample/preview methods and schedulers</u>
 
-Access the GGML model/prediction/RNG types, sample/preview methods and schedulers via the following maps:
+Access the LoRA apply modes, GGML model/prediction/RNG types, sample/preview methods and schedulers via the following maps:
 
 ```python
-from stable_diffusion_cpp import GGML_TYPE_MAP, RNG_TYPE_MAP, SCHEDULER_MAP, SAMPLE_METHOD_MAP, PREDICTION_MAP, PREVIEW_MAP
+from stable_diffusion_cpp import GGML_TYPE_MAP, RNG_TYPE_MAP, SCHEDULER_MAP, SAMPLE_METHOD_MAP, PREDICTION_MAP, PREVIEW_MAP, LORA_APPLY_MODE_MAP
 
 print("GGML model types:", list(GGML_TYPE_MAP))
 print("RNG types:", list(RNG_TYPE_MAP))
 print("Schedulers:", list(SCHEDULER_MAP))
 print("Sample methods:", list(SAMPLE_METHOD_MAP))
 print("Prediction types:", list(PREDICTION_MAP))
 print("Preview methods:", list(PREVIEW_MAP))
+print("LoRA apply modes:", list(LORA_APPLY_MODE_MAP))
 ```
 
 ---

stable_diffusion_cpp/__init__.py

@@ -4,4 +4,4 @@
 
 # isort: on
 
-__version__ = "0.3.7"
+__version__ = "0.3.8"

stable_diffusion_cpp/_internals.py

@@ -33,11 +33,14 @@ def __init__(
         lora_model_dir: str,
         embedding_dir: str,
         photo_maker_path: str,
+        tensor_type_rules: str,
         vae_decode_only: bool,
         n_threads: int,
         wtype: int,
         rng_type: int,
+        sampler_rng_type: int,
         prediction: int,
+        lora_apply_mode: int,
         offload_params_to_cpu: bool,
         keep_clip_on_cpu: bool,
         keep_control_net_on_cpu: bool,
@@ -71,12 +74,15 @@ def __init__(
             lora_model_dir=lora_model_dir.encode("utf-8"),
             embedding_dir=embedding_dir.encode("utf-8"),
             photo_maker_path=photo_maker_path.encode("utf-8"),
+            tensor_type_rules=tensor_type_rules.encode("utf-8"),
             vae_decode_only=vae_decode_only,
             free_params_immediately=False,  # Don't unload model
             n_threads=n_threads,
             wtype=wtype,
             rng_type=rng_type,
+            sampler_rng_type=sampler_rng_type,
             prediction=prediction,
+            lora_apply_mode=lora_apply_mode,
             offload_params_to_cpu=offload_params_to_cpu,
             keep_clip_on_cpu=keep_clip_on_cpu,
             keep_control_net_on_cpu=keep_control_net_on_cpu,