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: [PATCH] move to stable-diffusion tab

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

diff --git a/modules/shared.py b/modules/shared.py
index 0d96c14cb..e49e9b74c 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()