Merge branch 'dev' into master

1 files changed, 8 insertions, 2 deletions

diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py
index ff361f22..f22aad8f 100644
--- a/modules/sd_samplers.py
+++ b/modules/sd_samplers.py
@@ -1,7 +1,7 @@
 from modules import sd_samplers_compvis, sd_samplers_kdiffusion, 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

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

 

 all_samplers = [

     *sd_samplers_kdiffusion.samplers_data_k_diffusion,

@@ -14,12 +14,18 @@ samplers_for_img2img = []
 samplers_map = {}

 

 

-def create_sampler(name, model):

+def find_sampler_config(name):

     if name is not None:

         config = all_samplers_map.get(name, None)

     else:

         config = all_samplers[0]

 

+    return config

+

+

+def create_sampler(name, model):

+    config = find_sampler_config(name)

+

     assert config is not None, f'bad sampler name: {name}'

 

     sampler = config.constructor(model)