Merge branch 'release_candidate'

1 files changed, 11 insertions, 8 deletions

diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py
index bea2684c..45faae62 100644
--- a/modules/sd_samplers.py
+++ b/modules/sd_samplers.py
@@ -1,17 +1,18 @@
-from modules import sd_samplers_compvis, sd_samplers_kdiffusion, shared

+from modules import sd_samplers_kdiffusion, sd_samplers_timesteps, shared

 

 # imports for functions that previously were here and are used by other modules

 from modules.sd_samplers_common import samples_to_image_grid, sample_to_image  # noqa: F401

 

 all_samplers = [

     *sd_samplers_kdiffusion.samplers_data_k_diffusion,

-    *sd_samplers_compvis.samplers_data_compvis,

+    *sd_samplers_timesteps.samplers_data_timesteps,

 ]

 all_samplers_map = {x.name: x for x in all_samplers}

 

 samplers = []

 samplers_for_img2img = []

 samplers_map = {}

+samplers_hidden = {}

 

 

 def find_sampler_config(name):

@@ -38,13 +39,11 @@ def create_sampler(name, model):
 

 

 def set_samplers():

-    global samplers, samplers_for_img2img

+    global samplers, samplers_for_img2img, samplers_hidden

 

-    hidden = set(shared.opts.hide_samplers)

-    hidden_img2img = set(shared.opts.hide_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_hidden = set(shared.opts.hide_samplers)

+    samplers = all_samplers

+    samplers_for_img2img = all_samplers

 

     samplers_map.clear()

     for sampler in all_samplers:

@@ -53,4 +52,8 @@ def set_samplers():
             samplers_map[alias.lower()] = sampler.name

 

 

+def visible_sampler_names():

+    return [x.name for x in samplers if x.name not in samplers_hidden]

+

+

 set_samplers()