Merge branch 'master' into test_resolve_conflicts

1 files changed, 3 insertions, 12 deletions

diff --git a/modules/processing.py b/modules/processing.py
index 685f9fcd..6c4bde6e 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -53,11 +53,7 @@ def get_correct_sampler(p):
 

 

 class StableDiffusionProcessing:

-    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt="", styles=None, seed=-1,

-                 subseed=-1, subseed_strength=0, seed_resize_from_h=-1, seed_resize_from_w=-1, seed_enable_extras=True,

-                 sampler_index=0, batch_size=1, n_iter=1, steps=50, cfg_scale=7.0, width=512, height=512,

-                 restore_faces=False, tiling=False, do_not_save_samples=False, do_not_save_grid=False,

-                 extra_generation_params=None, overlay_images=None, negative_prompt=None, eta=None):

+    def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prompt="", styles=None, seed=-1, subseed=-1, subseed_strength=0, seed_resize_from_h=-1, seed_resize_from_w=-1, seed_enable_extras=True, sampler_index=0, batch_size=1, n_iter=1, steps=50, cfg_scale=7.0, width=512, height=512, restore_faces=False, tiling=False, do_not_save_samples=False, do_not_save_grid=False, extra_generation_params=None, overlay_images=None, negative_prompt=None, eta=None, do_not_reload_embeddings=False):

         self.sd_model = sd_model

         self.outpath_samples: str = outpath_samples

         self.outpath_grids: str = outpath_grids

@@ -84,6 +80,7 @@ class StableDiffusionProcessing:
         self.extra_generation_params: dict = extra_generation_params or {}

         self.overlay_images = overlay_images

         self.eta = eta

+        self.do_not_reload_embeddings = do_not_reload_embeddings

         self.paste_to = None

         self.color_corrections = None

         self.denoising_strength: float = 0

@@ -350,12 +347,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
     seed = get_fixed_seed(p.seed)

     subseed = get_fixed_seed(p.subseed)

 

-    if p.outpath_samples is not None:

-        os.makedirs(p.outpath_samples, exist_ok=True)

-

-    if p.outpath_grids is not None:

-        os.makedirs(p.outpath_grids, exist_ok=True)

-

     modules.sd_hijack.model_hijack.apply_circular(p.tiling)

     modules.sd_hijack.model_hijack.clear_comments()

 

@@ -381,7 +372,7 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
     def infotext(iteration=0, position_in_batch=0):

         return create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration, position_in_batch)

 

-    if os.path.exists(cmd_opts.embeddings_dir):

+    if os.path.exists(cmd_opts.embeddings_dir) and not p.do_not_reload_embeddings:

         model_hijack.embedding_db.load_textual_inversion_embeddings()

 

     infotexts = []