From 610e89642daaffb7543445bd7bead379f0342bef Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 20 Nov 2023 16:49:27 -0500 Subject: [PATCH 1/6] fix controlnet compatibility --- extensions-builtin/sd-webui-agent-scheduler | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- modules/sd_models.py | 2 ++ wiki | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index 8970f485b..7a03f4e67 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit 8970f485b767929cb36b5fee0df1d98840023f2a +Subproject commit 7a03f4e6786b00b99607a13b362961dd80d6cacf diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 05ef0b1cd..0efcf8c99 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 05ef0b1cd1374cf285dd8d5ccd7db9997549893c +Subproject commit 0efcf8c99345a67b62b6f54683bc046a7627698b diff --git a/modules/sd_models.py b/modules/sd_models.py index fbdfc1424..e4c1c196e 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -564,6 +564,8 @@ class ModelData: self.sd_model = reload_model_weights(op='model') if self.sd_model is not None: self.sd_model.is_sdxl = False # a1111 compatibility item + self.sd_model.is_sd2 = False # a1111 compatibility item + self.sd_model.is_sd1 = True # a1111 compatibility item self.initial = False except Exception as e: shared.log.error("Failed to load stable diffusion model") diff --git a/wiki b/wiki index c2267ae1f..6f0a39eda 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit c2267ae1f84489926b0c79cc82b416f30d7b93b0 +Subproject commit 6f0a39edad41d6d13b2822c7f93fab22d706c693 From bee397e8da5e304e993b532211f8c66af33c7ccf Mon Sep 17 00:00:00 2001 From: Disty0 Date: Tue, 21 Nov 2023 14:39:20 +0300 Subject: [PATCH 2/6] Fix non-existent OpenVINO version --- installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installer.py b/installer.py index adb57121f..5f744bfee 100644 --- a/installer.py +++ b/installer.py @@ -515,8 +515,8 @@ def check_torch(): if opts.get('cuda_compile_backend', '') == 'hidet': install('hidet', 'hidet') if args.use_openvino or opts.get('cuda_compile_backend', '') == 'openvino_fx': - uninstall('openvino') - install('openvino-nightly==2023.2.0.dev20231102', 'openvino-nightly') + uninstall('openvino-nightly') # TODO remove after people had enough time upgrading + install('openvino==2023.2.0', 'openvino') install('onnxruntime-openvino', 'onnxruntime-openvino', ignore=True) # TODO numpy version conflicts with tensorflow and doesn't support Python 3.11 os.environ.setdefault('PYTORCH_TRACING_MODE', 'TORCHFX') os.environ.setdefault('NEOReadDebugKeys', '1') From e70f3eecda6fcd76fb01c7fd383edf86ebfce615 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 23 Nov 2023 10:39:44 -0500 Subject: [PATCH 3/6] cleanup master --- extensions-builtin/sd-webui-agent-scheduler | 2 +- extensions-builtin/sd-webui-controlnet | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index 7a03f4e67..a8d527b26 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit 7a03f4e6786b00b99607a13b362961dd80d6cacf +Subproject commit a8d527b269358595bd7f9c839f266b1db5bea468 diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 0efcf8c99..10bd9b25f 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 0efcf8c99345a67b62b6f54683bc046a7627698b +Subproject commit 10bd9b25f62deab9acb256301bbf3363c42645e7 From 88aabcb3c5eb35b09973c9d0e96f5e05f816914a Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 23 Nov 2023 10:45:40 -0500 Subject: [PATCH 4/6] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a836912cd..21c1a45ea 100644 --- a/CHANGELOG.md +++ b/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) From aed6aa021709b79e6b139ccbde3b969d0d2b3993 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 23 Nov 2023 14:23:19 -0500 Subject: [PATCH 5/6] relax type checks --- modules/merging/merge.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/merging/merge.py b/modules/merging/merge.py index 68d4b2c21..7452cb3e6 100644 --- a/modules/merging/merge.py +++ b/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, From 36562509f0c2bceee386ccd1ea14ada51e89e2fa Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 23 Nov 2023 14:38:46 -0500 Subject: [PATCH 6/6] fix types --- modules/merging/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/merging/merge.py b/modules/merging/merge.py index 7452cb3e6..4ea76fc2d 100644 --- a/modules/merging/merge.py +++ b/modules/merging/merge.py @@ -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",