From 2cfaffb239bb2b99aab06352f8c101e48e48dec9 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sun, 14 May 2023 08:30:37 +0300
Subject: [PATCH] updates for #9256

---
 modules/generation_parameters_copypaste.py | 2 +-
 modules/shared.py                          | 4 ++--
 requirements.txt                           | 1 +
 requirements_versions.txt                  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index a0a98bbcb..f1a2204c3 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -311,7 +311,7 @@ infotext_to_setting_name_mapping = [
     ('Token merging ratio', 'token_merging_ratio'),
     ('Token merging ratio hr', 'token_merging_ratio_hr'),
     ('RNG', 'randn_source'),
-    ('NGMS', 's_min_uncond')
+    ('NGMS', 's_min_uncond'),
 ]
 
 
diff --git a/modules/shared.py b/modules/shared.py
index a5e8d0bd0..7ec9967e3 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -350,8 +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})
+    "token_merging_ratio": OptionInfo(0.0, "Token merging ratio", gr.Slider, {"minimum": 0.0, "maximum": 0.9, "step": 0.1}),
+    "token_merging_ratio_hr": OptionInfo(0.0, "Togen merging ratio for high-res pass", gr.Slider, {"minimum": 0.0, "maximum": 0.9, "step": 0.1}),
 }))
 
 options_templates.update(options_section(('compatibility', "Compatibility"), {
diff --git a/requirements.txt b/requirements.txt
index 2423bfd22..302b3dabd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,3 +29,4 @@ torchsde
 safetensors
 psutil
 rich
+tomesd
diff --git a/requirements_versions.txt b/requirements_versions.txt
index 0e03deedc..17ae9484c 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -26,4 +26,4 @@ torchsde==0.2.5
 safetensors==0.3.1
 httpcore<=0.15
 fastapi==0.94.0
-tomesd>=0.1.2
\ No newline at end of file
+tomesd==0.1.2