From a609bd56b4206460d1df3c3022025fc78b66718f Mon Sep 17 00:00:00 2001
From: papuSpartan <macabeg@icloud.com>
Date: Sat, 1 Apr 2023 22:18:35 -0500
Subject: Transition to using settings through UI instead of cmd line args.
 Added feature to only apply to hr-fix. Install package using
 requirements_versions.txt

---
 modules/shared.py | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'modules/shared.py')

diff --git a/modules/shared.py b/modules/shared.py
index 5fd0eecb..d7379e24 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -427,6 +427,50 @@ options_templates.update(options_section((None, "Hidden options"), {
     "sd_checkpoint_hash": OptionInfo("", "SHA256 hash of the current checkpoint"),
 }))
 
+options_templates.update(options_section(('token_merging', 'Token Merging'), {
+    "token_merging": OptionInfo(
+        False, "Enable redundant token merging via tomesd. (currently incompatible with controlnet extension)",
+        gr.Checkbox
+    ),
+    "token_merging_ratio": OptionInfo(
+        0.5, "Merging Ratio",
+        gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
+    ),
+    "token_merging_hr_only": OptionInfo(
+        True, "Apply only to high-res fix pass. Disabling can yield a ~20-35% speedup on contemporary resolutions.",
+        gr.Checkbox
+    ),
+    # More advanced/niche settings:
+    "token_merging_random": OptionInfo(
+        True, "Use random perturbations - Disabling might help with certain samplers",
+        gr.Checkbox
+    ),
+    "token_merging_merge_attention": OptionInfo(
+        True, "Merge attention",
+        gr.Checkbox
+    ),
+     "token_merging_merge_cross_attention": OptionInfo(
+        False, "Merge cross attention",
+        gr.Checkbox
+    ),
+    "token_merging_merge_mlp": OptionInfo(
+        False, "Merge mlp",
+        gr.Checkbox
+    ),
+    "token_merging_maximum_down_sampling": OptionInfo(
+        1, "Maximum down sampling",
+        gr.Dropdown, lambda: {"choices": ["1", "2", "4", "8"]}
+    ),
+    "token_merging_stride_x": OptionInfo(
+        2, "Stride - X",
+        gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}
+    ),
+    "token_merging_stride_y": OptionInfo(
+        2, "Stride - Y",
+        gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}
+    )
+}))
+
 options_templates.update()
 
 
-- 
cgit v1.2.3


From 5c8e53d5e98da0eabf384318955c57842d612c07 Mon Sep 17 00:00:00 2001
From: papuSpartan <macabeg@icloud.com>
Date: Tue, 4 Apr 2023 02:26:44 -0500
Subject: Allow different merge ratios to be used for each pass. Make toggle
 cmd flag work again. Remove ratio flag. Remove warning about controlnet being
 incompatible

---
 modules/cmd_args.py   |  3 +--
 modules/processing.py | 44 +++++++++++++++-----------------------------
 modules/sd_models.py  | 29 ++++++++++++++++++++++++++++-
 modules/shared.py     |  6 +++++-
 4 files changed, 49 insertions(+), 33 deletions(-)

(limited to 'modules/shared.py')

diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index 4314f97b..8e5a7fab 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -103,5 +103,4 @@ parser.add_argument("--no-hashing", action='store_true', help="disable sha256 ha
 parser.add_argument("--no-download-sd-model", action='store_true', help="don't download SD1.5 model even if no model is found in --ckpt-dir", default=False)
 
 # token merging / tomesd
-parser.add_argument("--token-merging", action='store_true', help="Provides generation speedup by merging redundant tokens. (compatible with --xformers)", default=False)
-parser.add_argument("--token-merging-ratio", type=float, help="Adjusts ratio of merged to untouched tokens. Range: (0.0-1.0], Defaults to 0.5", default=0.5)
+parser.add_argument("--token-merging", action='store_true', help="Provides speed and memory improvements by merging redundant tokens. This has a more pronounced effect on higher resolutions.", default=False)
diff --git a/modules/processing.py b/modules/processing.py
index 55735572..670a7a28 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -501,26 +501,16 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
             if k == 'sd_vae':
                 sd_vae.reload_vae_weights()
 
-        if opts.token_merging and not opts.token_merging_hr_only:
-            print("applying token merging to all passes")
-            tomesd.apply_patch(
-                p.sd_model,
-                ratio=opts.token_merging_ratio,
-                max_downsample=opts.token_merging_maximum_down_sampling,
-                sx=opts.token_merging_stride_x,
-                sy=opts.token_merging_stride_y,
-                use_rand=opts.token_merging_random,
-                merge_attn=opts.token_merging_merge_attention,
-                merge_crossattn=opts.token_merging_merge_cross_attention,
-                merge_mlp=opts.token_merging_merge_mlp
-            )
+        if (opts.token_merging or cmd_opts.token_merging) and not opts.token_merging_hr_only:
+            print("\nApplying token merging\n")
+            sd_models.apply_token_merging(sd_model=p.sd_model, hr=False)
 
         res = process_images_inner(p)
 
     finally:
         # undo model optimizations made by tomesd
-        if opts.token_merging:
-            print('removing token merging model optimizations')
+        if opts.token_merging or cmd_opts.token_merging:
+            print('\nRemoving token merging model optimizations\n')
             tomesd.remove_patch(p.sd_model)
 
         # restore opts to original state
@@ -959,20 +949,16 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         devices.torch_gc()
 
         # apply token merging optimizations from tomesd for high-res pass
-        # check if hr_only so we don't redundantly apply patch
-        if opts.token_merging and opts.token_merging_hr_only:
-            print("applying token merging for high-res pass")
-            tomesd.apply_patch(
-                self.sd_model,
-                ratio=opts.token_merging_ratio,
-                max_downsample=opts.token_merging_maximum_down_sampling,
-                sx=opts.token_merging_stride_x,
-                sy=opts.token_merging_stride_y,
-                use_rand=opts.token_merging_random,
-                merge_attn=opts.token_merging_merge_attention,
-                merge_crossattn=opts.token_merging_merge_cross_attention,
-                merge_mlp=opts.token_merging_merge_mlp
-            )
+        # check if hr_only so we are not redundantly patching
+        if (cmd_opts.token_merging or opts.token_merging) and (opts.token_merging_hr_only or opts.token_merging_ratio_hr != opts.token_merging_ratio):
+            # case where user wants to use separate merge ratios
+            if not opts.token_merging_hr_only:
+                # clean patch done by first pass. (clobbering the first patch might be fine? this might be excessive)
+                print('Temporarily reverting token merging optimizations in preparation for next pass')
+                tomesd.remove_patch(self.sd_model)
+
+            print("\nApplying token merging for high-res pass\n")
+            sd_models.apply_token_merging(sd_model=self.sd_model, hr=True)
 
         samples = self.sampler.sample_img2img(self, samples, noise, conditioning, unconditional_conditioning, steps=self.hr_second_pass_steps or self.steps, image_conditioning=image_conditioning)
 
diff --git a/modules/sd_models.py b/modules/sd_models.py
index 87c49b83..696a2333 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -16,6 +16,7 @@ from modules import paths, shared, modelloader, devices, script_callbacks, sd_va
 from modules.paths import models_path
 from modules.sd_hijack_inpainting import do_inpainting_hijack
 from modules.timer import Timer
+import tomesd
 
 model_dir = "Stable-diffusion"
 model_path = os.path.abspath(os.path.join(paths.models_path, model_dir))
@@ -545,4 +546,30 @@ def unload_model_weights(sd_model=None, info=None):
 
     print(f"Unloaded weights {timer.summary()}.")
 
-    return sd_model
\ No newline at end of file
+    return sd_model
+
+
+def apply_token_merging(sd_model, hr: bool):
+    """
+    Applies speed and memory optimizations from tomesd.
+
+    Args:
+        hr (bool): True if called in the context of a high-res pass
+    """
+
+    ratio = shared.opts.token_merging_ratio
+    if hr:
+        ratio = shared.opts.token_merging_ratio_hr
+        print("effective hr pass merge ratio is "+str(ratio))
+
+    tomesd.apply_patch(
+        sd_model,
+        ratio=ratio,
+        max_downsample=shared.opts.token_merging_maximum_down_sampling,
+        sx=shared.opts.token_merging_stride_x,
+        sy=shared.opts.token_merging_stride_y,
+        use_rand=shared.opts.token_merging_random,
+        merge_attn=shared.opts.token_merging_merge_attention,
+        merge_crossattn=shared.opts.token_merging_merge_cross_attention,
+        merge_mlp=shared.opts.token_merging_merge_mlp
+    )
diff --git a/modules/shared.py b/modules/shared.py
index d7379e24..c7572e98 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -429,7 +429,7 @@ options_templates.update(options_section((None, "Hidden options"), {
 
 options_templates.update(options_section(('token_merging', 'Token Merging'), {
     "token_merging": OptionInfo(
-        False, "Enable redundant token merging via tomesd. (currently incompatible with controlnet extension)",
+        0.5, "Enable redundant token merging via tomesd. This can provide significant speed and memory improvements.",
         gr.Checkbox
     ),
     "token_merging_ratio": OptionInfo(
@@ -440,6 +440,10 @@ options_templates.update(options_section(('token_merging', 'Token Merging'), {
         True, "Apply only to high-res fix pass. Disabling can yield a ~20-35% speedup on contemporary resolutions.",
         gr.Checkbox
     ),
+    "token_merging_ratio_hr": OptionInfo(
+        0.5, "Merging Ratio (high-res pass) - If 'Apply only to high-res' is enabled, this will always be the ratio used.",
+        gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
+    ),
     # More advanced/niche settings:
     "token_merging_random": OptionInfo(
         True, "Use random perturbations - Disabling might help with certain samplers",
-- 
cgit v1.2.3


From cf5a5773bfd1ca6a3c35232881661ec1ff4b67d7 Mon Sep 17 00:00:00 2001
From: papuSpartan <macabeg@icloud.com>
Date: Tue, 4 Apr 2023 02:39:13 -0500
Subject: :p

---
 modules/shared.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/shared.py')

diff --git a/modules/shared.py b/modules/shared.py
index c7572e98..568acdc4 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -429,7 +429,7 @@ options_templates.update(options_section((None, "Hidden options"), {
 
 options_templates.update(options_section(('token_merging', 'Token Merging'), {
     "token_merging": OptionInfo(
-        0.5, "Enable redundant token merging via tomesd. This can provide significant speed and memory improvements.",
+        False, "Enable redundant token merging via tomesd. This can provide significant speed and memory improvements.",
         gr.Checkbox
     ),
     "token_merging_ratio": OptionInfo(
-- 
cgit v1.2.3


From 1c1106260300ca3956d9619875e28278b148adab Mon Sep 17 00:00:00 2001
From: papuSpartan <macabeg@icloud.com>
Date: Mon, 10 Apr 2023 03:37:15 -0500
Subject: add token merging options to infotext when necessary. Bump tomesd
 version

---
 modules/generation_parameters_copypaste.py | 37 ++++++++++++++++++++++++++++++
 modules/processing.py                      | 22 ++++++++++++++----
 modules/shared.py                          |  2 +-
 requirements_versions.txt                  |  2 +-
 4 files changed, 57 insertions(+), 6 deletions(-)

(limited to 'modules/shared.py')

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 6df76858..a7ede534 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -282,6 +282,32 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         res["Hires resize-1"] = 0
         res["Hires resize-2"] = 0
 
+    # Infer additional override settings for token merging
+    print("inferring settings for tomesd")
+    token_merging_ratio = res.get("Token merging ratio", None)
+    token_merging_ratio_hr = res.get("Token merging ratio hr", None)
+
+    if token_merging_ratio is not None or token_merging_ratio_hr is not None:
+        res["Token merging"] = 'True'
+
+        if token_merging_ratio is None:
+            res["Token merging hr only"] = 'True'
+        else:
+            res["Token merging hr only"] = 'False'
+
+        if res.get("Token merging random", None) is None:
+            res["Token merging random"] = 'False'
+        if res.get("Token merging merge attention", None) is None:
+            res["Token merging merge attention"] = 'True'
+        if res.get("Token merging merge cross attention", None) is None:
+            res["Token merging merge cross attention"] = 'False'
+        if res.get("Token merging merge mlp", None) is None:
+            res["Token merging merge mlp"] = 'False'
+        if res.get("Token merging stride x", None) is None:
+            res["Token merging stride x"] = '2'
+        if res.get("Token merging stride y", None) is None:
+            res["Token merging stride y"] = '2'
+
     restore_old_hires_fix_params(res)
 
     return res
@@ -304,6 +330,17 @@ infotext_to_setting_name_mapping = [
     ('UniPC skip type', 'uni_pc_skip_type'),
     ('UniPC order', 'uni_pc_order'),
     ('UniPC lower order final', 'uni_pc_lower_order_final'),
+    ('Token merging', 'token_merging'),
+    ('Token merging ratio', 'token_merging_ratio'),
+    ('Token merging hr only', 'token_merging_hr_only'),
+    ('Token merging ratio hr', 'token_merging_ratio_hr'),
+    ('Token merging random', 'token_merging_random'),
+    ('Token merging merge attention', 'token_merging_merge_attention'),
+    ('Token merging merge cross attention', 'token_merging_merge_cross_attention'),
+    ('Token merging merge mlp', 'token_merging_merge_mlp'),
+    ('Token merging maximum downsampling', 'token_merging_maximum_downsampling'),
+    ('Token merging stride x', 'token_merging_stride_x'),
+    ('Token merging stride y', 'token_merging_stride_y')
 ]
 
 
diff --git a/modules/processing.py b/modules/processing.py
index 670a7a28..95058d0b 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -31,6 +31,12 @@ from einops import repeat, rearrange
 from blendmodes.blend import blendLayers, BlendType
 import tomesd
 
+# add a logger for the processing module
+logger = logging.getLogger(__name__)
+# manually set output level here since there is no option to do so yet through launch options
+# logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(name)s %(message)s')
+
+
 # some of those options should not be changed at all because they would break the model, so I removed them from options.
 opt_C = 4
 opt_f = 8
@@ -477,6 +483,14 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Conditional mask weight": getattr(p, "inpainting_mask_weight", shared.opts.inpainting_mask_weight) if p.is_using_inpainting_conditioning else None,
         "Clip skip": None if clip_skip <= 1 else clip_skip,
         "ENSD": None if opts.eta_noise_seed_delta == 0 else opts.eta_noise_seed_delta,
+        "Token merging ratio": None if not (opts.token_merging or cmd_opts.token_merging) or opts.token_merging_hr_only else opts.token_merging_ratio,
+        "Token merging ratio hr": None if not (opts.token_merging or cmd_opts.token_merging) else opts.token_merging_ratio_hr,
+        "Token merging random": None if opts.token_merging_random is False else opts.token_merging_random,
+        "Token merging merge attention": None if opts.token_merging_merge_attention is True else opts.token_merging_merge_attention,
+        "Token merging merge cross attention": None if opts.token_merging_merge_cross_attention is False else opts.token_merging_merge_cross_attention,
+        "Token merging merge mlp": None if opts.token_merging_merge_mlp is False else opts.token_merging_merge_mlp,
+        "Token merging stride x": None if opts.token_merging_stride_x == 2 else opts.token_merging_stride_x,
+        "Token merging stride y": None if opts.token_merging_stride_y == 2 else opts.token_merging_stride_y
     }
 
     generation_params.update(p.extra_generation_params)
@@ -502,16 +516,16 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
                 sd_vae.reload_vae_weights()
 
         if (opts.token_merging or cmd_opts.token_merging) and not opts.token_merging_hr_only:
-            print("\nApplying token merging\n")
             sd_models.apply_token_merging(sd_model=p.sd_model, hr=False)
+            logger.debug('Token merging applied')
 
         res = process_images_inner(p)
 
     finally:
         # undo model optimizations made by tomesd
         if opts.token_merging or cmd_opts.token_merging:
-            print('\nRemoving token merging model optimizations\n')
             tomesd.remove_patch(p.sd_model)
+            logger.debug('Token merging model optimizations removed')
 
         # restore opts to original state
         if p.override_settings_restore_afterwards:
@@ -954,11 +968,11 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
             # case where user wants to use separate merge ratios
             if not opts.token_merging_hr_only:
                 # clean patch done by first pass. (clobbering the first patch might be fine? this might be excessive)
-                print('Temporarily reverting token merging optimizations in preparation for next pass')
                 tomesd.remove_patch(self.sd_model)
+                logger.debug('Temporarily removed token merging optimizations in preparation for next pass')
 
-            print("\nApplying token merging for high-res pass\n")
             sd_models.apply_token_merging(sd_model=self.sd_model, hr=True)
+            logger.debug('Applied token merging for high-res pass')
 
         samples = self.sampler.sample_img2img(self, samples, noise, conditioning, unconditional_conditioning, steps=self.hr_second_pass_steps or self.steps, image_conditioning=image_conditioning)
 
diff --git a/modules/shared.py b/modules/shared.py
index 568acdc4..d9db7317 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -446,7 +446,7 @@ options_templates.update(options_section(('token_merging', 'Token Merging'), {
     ),
     # More advanced/niche settings:
     "token_merging_random": OptionInfo(
-        True, "Use random perturbations - Disabling might help with certain samplers",
+        False, "Use random perturbations - Can improve outputs for certain samplers. For others, it may cause visaul artifacting.",
         gr.Checkbox
     ),
     "token_merging_merge_attention": OptionInfo(
diff --git a/requirements_versions.txt b/requirements_versions.txt
index 03522715..f972f975 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -28,4 +28,4 @@ torchsde==0.2.5
 safetensors==0.3.0
 httpcore<=0.15
 fastapi==0.94.0
-tomesd>=0.1.1
\ No newline at end of file
+tomesd>=0.1.2
\ No newline at end of file
-- 
cgit v1.2.3


From c510cfd24b995f8267df3391cc961ac398922ba4 Mon Sep 17 00:00:00 2001
From: papuSpartan <30642826+papuSpartan@users.noreply.github.com>
Date: Mon, 10 Apr 2023 03:43:56 -0500
Subject: Update shared.py

fix typo
---
 modules/shared.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/shared.py')

diff --git a/modules/shared.py b/modules/shared.py
index d9db7317..edf11e43 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -446,7 +446,7 @@ options_templates.update(options_section(('token_merging', 'Token Merging'), {
     ),
     # More advanced/niche settings:
     "token_merging_random": OptionInfo(
-        False, "Use random perturbations - Can improve outputs for certain samplers. For others, it may cause visaul artifacting.",
+        False, "Use random perturbations - Can improve outputs for certain samplers. For others, it may cause visual artifacting.",
         gr.Checkbox
     ),
     "token_merging_merge_attention": OptionInfo(
-- 
cgit v1.2.3


From e960781511eb175943be09b314ac2be46b6fc684 Mon Sep 17 00:00:00 2001
From: papuSpartan <30642826+papuSpartan@users.noreply.github.com>
Date: Wed, 3 May 2023 13:12:43 -0500
Subject: fix maximum downsampling option

---
 modules/generation_parameters_copypaste.py | 4 +++-
 modules/processing.py                      | 1 +
 modules/shared.py                          | 5 +----
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/shared.py')

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 34c1b860..83382e93 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -306,6 +306,8 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
             res["Token merging stride x"] = '2'
         if res.get("Token merging stride y", None) is None:
             res["Token merging stride y"] = '2'
+        if res.get("Token merging maximum down sampling", None) is None:
+            res["Token merging maximum down sampling"] = '1'
 
     restore_old_hires_fix_params(res)
 
@@ -341,7 +343,7 @@ infotext_to_setting_name_mapping = [
     ('Token merging merge attention', 'token_merging_merge_attention'),
     ('Token merging merge cross attention', 'token_merging_merge_cross_attention'),
     ('Token merging merge mlp', 'token_merging_merge_mlp'),
-    ('Token merging maximum downsampling', 'token_merging_maximum_downsampling'),
+    ('Token merging maximum down sampling', 'token_merging_maximum_down_sampling'),
     ('Token merging stride x', 'token_merging_stride_x'),
     ('Token merging stride y', 'token_merging_stride_y'),
     ('RNG', 'randn_source'),
diff --git a/modules/processing.py b/modules/processing.py
index d5d1da5a..6807a301 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -495,6 +495,7 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Token merging merge mlp": None if opts.token_merging_merge_mlp is False else opts.token_merging_merge_mlp,
         "Token merging stride x": None if opts.token_merging_stride_x == 2 else opts.token_merging_stride_x,
         "Token merging stride y": None if opts.token_merging_stride_y == 2 else opts.token_merging_stride_y,
+        "Token merging maximum down sampling": None if opts.token_merging_maximum_down_sampling == 1 else opts.token_merging_maximum_down_sampling,
         "Init image hash": getattr(p, 'init_img_hash', None),
         "RNG": opts.randn_source if opts.randn_source != "GPU" else None,
         "NGMS": None if p.s_min_uncond == 0 else p.s_min_uncond,
diff --git a/modules/shared.py b/modules/shared.py
index 7b81ffc9..a7a72dd5 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -488,10 +488,7 @@ options_templates.update(options_section(('token_merging', 'Token Merging'), {
         False, "Merge mlp",
         gr.Checkbox
     ),
-    "token_merging_maximum_down_sampling": OptionInfo(
-        1, "Maximum down sampling",
-        gr.Dropdown, lambda: {"choices": ["1", "2", "4", "8"]}
-    ),
+    "token_merging_maximum_down_sampling": OptionInfo(1, "Maximum down sampling", gr.Radio, lambda: {"choices": ['1', '2', '4', '8']}),
     "token_merging_stride_x": OptionInfo(
         2, "Stride - X",
         gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}
-- 
cgit v1.2.3


From f0efc8c211fc2d2c2f8caf6e2f92501922d18c99 Mon Sep 17 00:00:00 2001
From: papuSpartan <30642826+papuSpartan@users.noreply.github.com>
Date: Wed, 3 May 2023 21:10:31 -0500
Subject: not being cast properly every time, swap to ints

---
 modules/shared.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/shared.py')

diff --git a/modules/shared.py b/modules/shared.py
index a7a72dd5..eb06909c 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -488,7 +488,7 @@ options_templates.update(options_section(('token_merging', 'Token Merging'), {
         False, "Merge mlp",
         gr.Checkbox
     ),
-    "token_merging_maximum_down_sampling": OptionInfo(1, "Maximum down sampling", gr.Radio, lambda: {"choices": ['1', '2', '4', '8']}),
+    "token_merging_maximum_down_sampling": OptionInfo(1, "Maximum down sampling", gr.Radio, lambda: {"choices": [1, 2, 4, 8]}),
     "token_merging_stride_x": OptionInfo(
         2, "Stride - X",
         gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}
-- 
cgit v1.2.3


From ac83627a31daac06f4d48b0e7db223ef807fe8e5 Mon Sep 17 00:00:00 2001
From: papuSpartan <30642826+papuSpartan@users.noreply.github.com>
Date: Sat, 13 May 2023 10:23:42 -0500
Subject: heavily simplify

---
 modules/generation_parameters_copypaste.py | 36 -------------------------
 modules/processing.py                      | 35 +++++++++++--------------
 modules/sd_models.py                       | 11 +++-----
 modules/shared.py                          | 42 +++---------------------------
 4 files changed, 23 insertions(+), 101 deletions(-)

(limited to 'modules/shared.py')

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index fb56254f..a0a98bbc 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -282,33 +282,6 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         res["Hires resize-1"] = 0
         res["Hires resize-2"] = 0
 
-    # Infer additional override settings for token merging
-    token_merging_ratio = res.get("Token merging ratio", None)
-    token_merging_ratio_hr = res.get("Token merging ratio hr", None)
-
-    if token_merging_ratio is not None or token_merging_ratio_hr is not None:
-        res["Token merging"] = 'True'
-
-        if token_merging_ratio is None:
-            res["Token merging hr only"] = 'True'
-        else:
-            res["Token merging hr only"] = 'False'
-
-        if res.get("Token merging random", None) is None:
-            res["Token merging random"] = 'False'
-        if res.get("Token merging merge attention", None) is None:
-            res["Token merging merge attention"] = 'True'
-        if res.get("Token merging merge cross attention", None) is None:
-            res["Token merging merge cross attention"] = 'False'
-        if res.get("Token merging merge mlp", None) is None:
-            res["Token merging merge mlp"] = 'False'
-        if res.get("Token merging stride x", None) is None:
-            res["Token merging stride x"] = '2'
-        if res.get("Token merging stride y", None) is None:
-            res["Token merging stride y"] = '2'
-        if res.get("Token merging maximum down sampling", None) is None:
-            res["Token merging maximum down sampling"] = '1'
-
     restore_old_hires_fix_params(res)
 
     # Missing RNG means the default was set, which is GPU RNG
@@ -335,17 +308,8 @@ infotext_to_setting_name_mapping = [
     ('UniPC skip type', 'uni_pc_skip_type'),
     ('UniPC order', 'uni_pc_order'),
     ('UniPC lower order final', 'uni_pc_lower_order_final'),
-    ('Token merging', 'token_merging'),
     ('Token merging ratio', 'token_merging_ratio'),
-    ('Token merging hr only', 'token_merging_hr_only'),
     ('Token merging ratio hr', 'token_merging_ratio_hr'),
-    ('Token merging random', 'token_merging_random'),
-    ('Token merging merge attention', 'token_merging_merge_attention'),
-    ('Token merging merge cross attention', 'token_merging_merge_cross_attention'),
-    ('Token merging merge mlp', 'token_merging_merge_mlp'),
-    ('Token merging maximum down sampling', 'token_merging_maximum_down_sampling'),
-    ('Token merging stride x', 'token_merging_stride_x'),
-    ('Token merging stride y', 'token_merging_stride_y'),
     ('RNG', 'randn_source'),
     ('NGMS', 's_min_uncond')
 ]
diff --git a/modules/processing.py b/modules/processing.py
index 6828e898..32ff61e9 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -34,7 +34,7 @@ import tomesd
 # add a logger for the processing module
 logger = logging.getLogger(__name__)
 # manually set output level here since there is no option to do so yet through launch options
-# logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(name)s %(message)s')
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(name)s %(message)s')
 
 
 # some of those options should not be changed at all because they would break the model, so I removed them from options.
@@ -496,15 +496,8 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Conditional mask weight": getattr(p, "inpainting_mask_weight", shared.opts.inpainting_mask_weight) if p.is_using_inpainting_conditioning else None,
         "Clip skip": None if clip_skip <= 1 else clip_skip,
         "ENSD": None if opts.eta_noise_seed_delta == 0 else opts.eta_noise_seed_delta,
-        "Token merging ratio": None if not opts.token_merging or opts.token_merging_hr_only else opts.token_merging_ratio,
-        "Token merging ratio hr": None if not opts.token_merging else opts.token_merging_ratio_hr,
-        "Token merging random": None if opts.token_merging_random is False else opts.token_merging_random,
-        "Token merging merge attention": None if opts.token_merging_merge_attention is True else opts.token_merging_merge_attention,
-        "Token merging merge cross attention": None if opts.token_merging_merge_cross_attention is False else opts.token_merging_merge_cross_attention,
-        "Token merging merge mlp": None if opts.token_merging_merge_mlp is False else opts.token_merging_merge_mlp,
-        "Token merging stride x": None if opts.token_merging_stride_x == 2 else opts.token_merging_stride_x,
-        "Token merging stride y": None if opts.token_merging_stride_y == 2 else opts.token_merging_stride_y,
-        "Token merging maximum down sampling": None if opts.token_merging_maximum_down_sampling == 1 else opts.token_merging_maximum_down_sampling,
+        "Token merging ratio": None if opts.token_merging_ratio == 0 else opts.token_merging_ratio,
+        "Token merging ratio hr": None if not p.enable_hr or opts.token_merging_ratio_hr == 0 else opts.token_merging_ratio_hr,
         "Init image hash": getattr(p, 'init_img_hash', None),
         "RNG": opts.randn_source if opts.randn_source != "GPU" else None,
         "NGMS": None if p.s_min_uncond == 0 else p.s_min_uncond,
@@ -538,15 +531,15 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
             if k == 'sd_vae':
                 sd_vae.reload_vae_weights()
 
-        if opts.token_merging and not opts.token_merging_hr_only:
+        if opts.token_merging_ratio > 0:
             sd_models.apply_token_merging(sd_model=p.sd_model, hr=False)
-            logger.debug('Token merging applied')
+            logger.debug(f"Token merging applied to first pass. Ratio: '{opts.token_merging_ratio}'")
 
         res = process_images_inner(p)
 
     finally:
         # undo model optimizations made by tomesd
-        if opts.token_merging:
+        if opts.token_merging_ratio > 0:
             tomesd.remove_patch(p.sd_model)
             logger.debug('Token merging model optimizations removed')
 
@@ -1003,19 +996,21 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
         devices.torch_gc()
 
         # apply token merging optimizations from tomesd for high-res pass
-        # check if hr_only so we are not redundantly patching
-        if opts.token_merging and (opts.token_merging_hr_only or opts.token_merging_ratio_hr != opts.token_merging_ratio):
-            # case where user wants to use separate merge ratios
-            if not opts.token_merging_hr_only:
-                # clean patch done by first pass. (clobbering the first patch might be fine? this might be excessive)
+        if opts.token_merging_ratio_hr > 0:
+            # in case the user has used separate merge ratios
+            if opts.token_merging_ratio > 0:
                 tomesd.remove_patch(self.sd_model)
-                logger.debug('Temporarily removed token merging optimizations in preparation for next pass')
+                logger.debug('Adjusting token merging ratio for high-res pass')
 
             sd_models.apply_token_merging(sd_model=self.sd_model, hr=True)
-            logger.debug('Applied token merging for high-res pass')
+            logger.debug(f"Applied token merging for high-res pass. Ratio: '{opts.token_merging_ratio_hr}'")
 
         samples = self.sampler.sample_img2img(self, samples, noise, conditioning, unconditional_conditioning, steps=self.hr_second_pass_steps or self.steps, image_conditioning=image_conditioning)
 
+        if opts.token_merging_ratio_hr > 0 or opts.token_merging_ratio > 0:
+            tomesd.remove_patch(self.sd_model)
+            logger.debug('Removed token merging optimizations from model')
+
         self.is_hr_pass = False
 
         return samples
diff --git a/modules/sd_models.py b/modules/sd_models.py
index 4787193c..4c9a0a1f 100644
--- a/modules/sd_models.py
+++ b/modules/sd_models.py
@@ -596,11 +596,8 @@ def apply_token_merging(sd_model, hr: bool):
     tomesd.apply_patch(
         sd_model,
         ratio=ratio,
-        max_downsample=shared.opts.token_merging_maximum_down_sampling,
-        sx=shared.opts.token_merging_stride_x,
-        sy=shared.opts.token_merging_stride_y,
-        use_rand=shared.opts.token_merging_random,
-        merge_attn=shared.opts.token_merging_merge_attention,
-        merge_crossattn=shared.opts.token_merging_merge_cross_attention,
-        merge_mlp=shared.opts.token_merging_merge_mlp
+        use_rand=False,  # can cause issues with some samplers
+        merge_attn=True,
+        merge_crossattn=False,
+        merge_mlp=False
     )
diff --git a/modules/shared.py b/modules/shared.py
index 4b346585..0d96c14c 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -459,47 +459,13 @@ options_templates.update(options_section((None, "Hidden options"), {
 }))
 
 options_templates.update(options_section(('token_merging', 'Token Merging'), {
-    "token_merging": OptionInfo(
-        False, "Enable redundant token merging via tomesd. This can provide significant speed and memory improvements.",
-        gr.Checkbox
-    ),
-    "token_merging_ratio": OptionInfo(
-        0.5, "Merging Ratio",
-        gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
-    ),
-    "token_merging_hr_only": OptionInfo(
-        True, "Apply only to high-res fix pass. Disabling can yield a ~20-35% speedup on contemporary resolutions.",
-        gr.Checkbox
-    ),
     "token_merging_ratio_hr": OptionInfo(
-        0.5, "Merging Ratio (high-res pass) - If 'Apply only to high-res' is enabled, this will always be the ratio used.",
+        0, "Merging Ratio (high-res pass)",
         gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
     ),
-    # More advanced/niche settings:
-    "token_merging_random": OptionInfo(
-        False, "Use random perturbations - Can improve outputs for certain samplers. For others, it may cause visual artifacting.",
-        gr.Checkbox
-    ),
-    "token_merging_merge_attention": OptionInfo(
-        True, "Merge attention",
-        gr.Checkbox
-    ),
-     "token_merging_merge_cross_attention": OptionInfo(
-        False, "Merge cross attention",
-        gr.Checkbox
-    ),
-    "token_merging_merge_mlp": OptionInfo(
-        False, "Merge mlp",
-        gr.Checkbox
-    ),
-    "token_merging_maximum_down_sampling": OptionInfo(1, "Maximum down sampling", gr.Radio, lambda: {"choices": [1, 2, 4, 8]}),
-    "token_merging_stride_x": OptionInfo(
-        2, "Stride - X",
-        gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}
-    ),
-    "token_merging_stride_y": OptionInfo(
-        2, "Stride - Y",
-        gr.Slider, {"minimum": 2, "maximum": 8, "step": 2}
+    "token_merging_ratio": OptionInfo(
+        0, "Merging Ratio",
+        gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
     )
 }))
 
-- 
cgit v1.2.3


From 917faa5325371e51d68f7d6f7b15ea4466bd5adf Mon Sep 17 00:00:00 2001
From: papuSpartan <30642826+papuSpartan@users.noreply.github.com>
Date: Sat, 13 May 2023 10:26:09 -0500
Subject: move to stable-diffusion tab

---
 modules/shared.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'modules/shared.py')

diff --git a/modules/shared.py b/modules/shared.py
index 0d96c14c..e49e9b74 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -350,6 +350,8 @@ options_templates.update(options_section(('sd', "Stable Diffusion"), {
     "CLIP_stop_at_last_layers": OptionInfo(1, "Clip skip", gr.Slider, {"minimum": 1, "maximum": 12, "step": 1}),
     "upcast_attn": OptionInfo(False, "Upcast cross attention layer to float32"),
     "randn_source": OptionInfo("GPU", "Random number generator source. Changes seeds drastically. Use CPU to produce the same picture across different vidocard vendors.", gr.Radio, {"choices": ["GPU", "CPU"]}),
+    "token_merging_ratio_hr": OptionInfo(0, "Merging Ratio (high-res pass)", gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}),
+    "token_merging_ratio": OptionInfo(0, "Merging Ratio", gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1})
 }))
 
 options_templates.update(options_section(('compatibility', "Compatibility"), {
@@ -458,16 +460,6 @@ options_templates.update(options_section((None, "Hidden options"), {
     "sd_checkpoint_hash": OptionInfo("", "SHA256 hash of the current checkpoint"),
 }))
 
-options_templates.update(options_section(('token_merging', 'Token Merging'), {
-    "token_merging_ratio_hr": OptionInfo(
-        0, "Merging Ratio (high-res pass)",
-        gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
-    ),
-    "token_merging_ratio": OptionInfo(
-        0, "Merging Ratio",
-        gr.Slider, {"minimum": 0, "maximum": 0.9, "step": 0.1}
-    )
-}))
 
 options_templates.update()
 
-- 
cgit v1.2.3