enable cond cache by default

2 files changed, 19 insertions, 14 deletions

diff --git a/modules/processing.py b/modules/processing.py
index 7d21fb12..31745006 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -295,7 +295,7 @@ class StableDiffusionProcessing:
         self.sampler = None

         self.c = None

         self.uc = None

-        if not opts.experimental_persistent_cond_cache:

+        if not opts.persistent_cond_cache:

             StableDiffusionProcessing.cached_c = [None, None]

             StableDiffusionProcessing.cached_uc = [None, None]

 

@@ -319,6 +319,21 @@ class StableDiffusionProcessing:
         self.all_prompts = [shared.prompt_styles.apply_styles_to_prompt(x, self.styles) for x in self.all_prompts]

         self.all_negative_prompts = [shared.prompt_styles.apply_negative_styles_to_prompt(x, self.styles) for x in self.all_negative_prompts]

 

+    def cached_params(self, required_prompts, steps, extra_network_data):

+        """Returns parameters that invalidate the cond cache if changed"""

+

+        return (

+            required_prompts,

+            steps,

+            opts.CLIP_stop_at_last_layers,

+            shared.sd_model.sd_checkpoint_info,

+            extra_network_data,

+            opts.sdxl_crop_left,

+            opts.sdxl_crop_top,

+            self.width,

+            self.height,

+        )

+

     def get_conds_with_caching(self, function, required_prompts, steps, caches, extra_network_data):

         """

         Returns the result of calling function(shared.sd_model, required_prompts, steps)

@@ -332,17 +347,7 @@ class StableDiffusionProcessing:
         caches is a list with items described above.

         """

 

-        cached_params = (

-            required_prompts,

-            steps,

-            opts.CLIP_stop_at_last_layers,

-            shared.sd_model.sd_checkpoint_info,

-            extra_network_data,

-            opts.sdxl_crop_left,

-            opts.sdxl_crop_top,

-            self.width,

-            self.height,

-        )

+        cached_params = self.cached_params(required_prompts, steps, extra_network_data)

 

         for cache in caches:

             if cache[0] is not None and cached_params == cache[0]:

@@ -1184,7 +1189,7 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         super().close()

         self.hr_c = None

         self.hr_uc = None

-        if not opts.experimental_persistent_cond_cache:

+        if not opts.persistent_cond_cache:

             StableDiffusionProcessingTxt2Img.cached_hr_uc = [None, None]

             StableDiffusionProcessingTxt2Img.cached_hr_c = [None, None]

 

diff --git a/modules/shared.py b/modules/shared.py
index 8e1b8063..078e8135 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -506,7 +506,7 @@ options_templates.update(options_section(('optimizations', "Optimizations"), {
     "token_merging_ratio_img2img": OptionInfo(0.0, "Token merging ratio for img2img", gr.Slider, {"minimum": 0.0, "maximum": 0.9, "step": 0.1}).info("only applies if non-zero and overrides above"),

     "token_merging_ratio_hr": OptionInfo(0.0, "Token merging ratio for high-res pass", gr.Slider, {"minimum": 0.0, "maximum": 0.9, "step": 0.1}).info("only applies if non-zero and overrides above"),

     "pad_cond_uncond": OptionInfo(False, "Pad prompt/negative prompt to be same length").info("improves performance when prompt and negative prompt have different lengths; changes seeds"),

-    "experimental_persistent_cond_cache": OptionInfo(False, "persistent cond cache").info("Experimental, keep cond caches across jobs, reduce overhead."),

+    "persistent_cond_cache": OptionInfo(True, "Persistent cond cache").info("Do not recalculate conds from prompts if prompts have not changed since previous calculation"),

 }))

 

 options_templates.update(options_section(('compatibility', "Compatibility"), {