Merge pull request #1940 from Mikubill/dev

fix cond cache problem for a1111 1.6.x
Mikubill · Aug 22, 2023 · c5b8de0 · c5b8de0
2 parents 7c61836 + 80a5bb9
commit c5b8de0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/scripts/controlnet_version.py b/scripts/controlnet_version.py
@@ -1,4 +1,4 @@
-version_flag = 'v1.1.300'
+version_flag = 'v1.1.301'
 
 from scripts.logging import logger
 

diff --git a/scripts/hook.py b/scripts/hook.py
@@ -18,6 +18,7 @@
 from ldm.models.diffusion.ddpm import extract_into_tensor
 
 from modules.prompt_parser import MulticondLearnedConditioning, ComposableScheduledPromptConditioning, ScheduledPromptConditioning
+from modules.processing import StableDiffusionProcessing
 
 
 POSITIVE_MARK_TOKEN = 1024
@@ -83,6 +84,10 @@ def unmark_prompt_context(x):
     mark_batch = mark[:, None, None, None].to(x.dtype).to(x.device)
     uc_indices = mark.detach().cpu().numpy().tolist()
     uc_indices = [i for i, item in enumerate(uc_indices) if item < 0.5]
+
+    StableDiffusionProcessing.cached_c = [None, None]
+    StableDiffusionProcessing.cached_uc = [None, None]
+
     return mark_batch, uc_indices, context