From 4ed4f99d63618b00d6b64c171dc925b57232a967 Mon Sep 17 00:00:00 2001 From: RedCore <42092152+emirhnergn@users.noreply.github.com> Date: Mon, 24 Apr 2023 18:48:40 +0300 Subject: [PATCH] invert sampler selection process #447 --- extensions-builtin/sd-webui-controlnet | 2 +- extensions-builtin/stable-diffusion-webui-images-browser | 2 +- modules/lora | 2 +- modules/sd_samplers.py | 8 ++++---- modules/shared.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index 1ce36722a..9eeb71a79 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit 1ce36722acb09cf546979de3e92c53577761ef4b +Subproject commit 9eeb71a796b06f912e1e66acecf4242d165db67b diff --git a/extensions-builtin/stable-diffusion-webui-images-browser b/extensions-builtin/stable-diffusion-webui-images-browser index 0029d95a5..704e42c10 160000 --- a/extensions-builtin/stable-diffusion-webui-images-browser +++ b/extensions-builtin/stable-diffusion-webui-images-browser @@ -1 +1 @@ -Subproject commit 0029d95a5f720b387c530e916a9e166277aa66e2 +Subproject commit 704e42c10d01e6c6965493ec956a82bb8fc2da51 diff --git a/modules/lora b/modules/lora index 25c8279f2..852481e14 160000 --- a/modules/lora +++ b/modules/lora @@ -1 +1 @@ -Subproject commit 25c8279f2692983f262f7e024b52defff852ae46 +Subproject commit 852481e14d08d510377813790ade557b4e2313f5 diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py index ff361f22b..7b2200115 100644 --- a/modules/sd_samplers.py +++ b/modules/sd_samplers.py @@ -31,11 +31,11 @@ def create_sampler(name, model): def set_samplers(): global samplers, samplers_for_img2img - hidden = set(shared.opts.hide_samplers) - hidden_img2img = set(shared.opts.hide_samplers + ['PLMS', 'UniPC']) + shown = set(shared.opts.show_samplers) + shown_img2img = set(shared.opts.show_samplers + ['PLMS', 'UniPC']) - samplers = [x for x in all_samplers if x.name not in hidden] - samplers_for_img2img = [x for x in all_samplers if x.name not in hidden_img2img] + samplers = [x for x in all_samplers if x.name in shown] + samplers_for_img2img = [x for x in all_samplers if x.name in shown_img2img] samplers_map.clear() for sampler in all_samplers: diff --git a/modules/shared.py b/modules/shared.py index 664620561..02600ca9a 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -432,7 +432,7 @@ options_templates.update(options_section(('ui', "Live previews"), { })) options_templates.update(options_section(('sampler-params', "Sampler parameters"), { - "hide_samplers": OptionInfo(["Euler", "LMS", "Heun", "DPM2", "DPM2 a", "DPM++ 2M", "DPM fast", "DPM adaptive", "DPM++ 2S a Karras", "DPM++ 2S a", "DPM++ SDE Karras", "DPM2 a Karras", "LMS Karras"], "Hide samplers in user interface", gr.CheckboxGroup, lambda: {"choices": [x.name for x in list_samplers()]}), + "show_samplers": OptionInfo(["Euler", "LMS", "Heun", "DPM2", "DPM2 a", "DPM++ 2M", "DPM fast", "DPM adaptive", "DPM++ 2S a Karras", "DPM++ 2S a", "DPM++ SDE Karras", "DPM2 a Karras", "LMS Karras"], "Show samplers in user interface", gr.CheckboxGroup, lambda: {"choices": [x.name for x in list_samplers()]}), "eta_ddim": OptionInfo(0.0, "eta (noise multiplier) for DDIM", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}), "eta_ancestral": OptionInfo(1.0, "eta (noise multiplier) for ancestral samplers", gr.Slider, {"minimum": 0.0, "maximum": 1.0, "step": 0.01}), "ddim_discretize": OptionInfo('uniform', "img2img DDIM discretize", gr.Radio, {"choices": ['uniform', 'quad']}),