updates for #9256

AUTOMATIC1111 · May 14, 2023 · 2cfaffb · papuSpartan · May 14, 2023 · 2cfaffb
1 parent 7f6ef76
commit 2cfaffb
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
@@ -311,7 +311,7 @@ def parse_generation_parameters(x: str):
     ('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
@@ -350,8 +350,8 @@ def list_samplers():
     "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
@@ -29,3 +29,4 @@ torchsde
 safetensors
 psutil
 rich
+tomesd
diff --git 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
+tomesd==0.1.2