Merge pull request #2550 from vladmandic/master

refresh dev

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Update for 2023-11-23
 
+New release, primarily focused around three major new features: full **LCM** support, completely new **Model Merge** functionality and **Stable-fast** compile support  
+Also included are several other improvements and large number of hotfixes - see full changelog for details  
+
 - **Diffusers**  
   - **LCM** support for any *SD 1.5* or *SD-XL* model!  
     - download [lcm-lora-sd15](https://huggingface.co/latent-consistency/lcm-lora-sdv1-5/tree/main) and/or [lcm-lora-sdxl](https://huggingface.co/latent-consistency/lcm-lora-sdxl/tree/main)  

modules/merging/merge.py

@@ -72,7 +72,7 @@ def log_vram(txt=""):
 
 
 def load_thetas(
-    models: Dict[str, os.PathLike | str],
+    models: Dict[str, os.PathLike],
     prune: bool,
     device: torch.device,
     precision: str,
@@ -94,7 +94,7 @@ def load_thetas(
 
 
 def merge_models(
-    models: Dict[str, os.PathLike | str],
+    models: Dict[str, os.PathLike],
     merge_mode: str,
     precision: str = "fp16",
     weights_clip: bool = False,
@@ -227,7 +227,7 @@ def simple_merge(
 
 
 def rebasin_merge(
-    thetas: Dict[str, os.PathLike | str],
+    thetas: Dict[str, os.PathLike],
     weight_matcher: WeightClass,
     merge_mode: str,
     precision: str = "fp16",