Merge branch 'ljleb-fix-clip'

README.md

@@ -29,7 +29,7 @@ You can have a look at the provided `merge_models.py` cli for an example on how
 
 ## Changelog
 
-### 0.9.1
+### 0.9.1, 0.9.2
 - bugfixes
 - support for pix2pix and inpainting models
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sd-meh"
-version = "0.9.1"
+version = "0.9.2"
 description = "stable diffusion merging execution helper"
 authors = ["s1dlx <[email protected]>"]
 license = "MIT"

sd_meh/__init__.py

@@ -1 +1 @@
-__version__ = "0.9.1"
+__version__ = "0.9.2"

sd_meh/merge.py

@@ -152,15 +152,12 @@ def merge_models(
             bases,
             merge_mode,
             precision=precision,
-            weights_clip=False,
+            weights_clip=weights_clip,
             iterations=iterations,
             device=device,
             work_device=work_device,
             threads=threads,
         )
-        # clip only after the last re-basin iteration
-        if weights_clip:
-            merged = clip_weights(thetas, merged)
     else:
         merged = simple_merge(
             thetas,
@@ -298,7 +295,7 @@ def rebasin_merge(
             new_bases,
             merge_mode,
             precision,
-            weights_clip,
+            False,
             device,
             work_device,
             threads,
@@ -344,6 +341,11 @@ def rebasin_merge(
 
         log_vram("model a updated")
 
+    if weights_clip:
+        clip_thetas = thetas.copy()
+        clip_thetas["model_a"] = model_a
+        thetas["model_a"] = clip_weights(thetas, thetas["model_a"])
+
     return thetas["model_a"]