Merge branch 'master' into tensorboard

1 files changed, 8 insertions, 5 deletions

diff --git a/modules/textual_inversion/ui.py b/modules/textual_inversion/ui.py
index 36881e7a..35c4feef 100644
--- a/modules/textual_inversion/ui.py
+++ b/modules/textual_inversion/ui.py
@@ -7,8 +7,8 @@ import modules.textual_inversion.preprocess
 from modules import sd_hijack, shared

 

 

-def create_embedding(name, initialization_text, nvpt):

-    filename = modules.textual_inversion.textual_inversion.create_embedding(name, nvpt, init_text=initialization_text)

+def create_embedding(name, initialization_text, nvpt, overwrite_old):

+    filename = modules.textual_inversion.textual_inversion.create_embedding(name, nvpt, overwrite_old, init_text=initialization_text)

 

     sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings()

 

@@ -18,15 +18,17 @@ def create_embedding(name, initialization_text, nvpt):
 def preprocess(*args):

     modules.textual_inversion.preprocess.preprocess(*args)

 

-    return "Preprocessing finished.", ""

+    return f"Preprocessing {'interrupted' if shared.state.interrupted else 'finished'}.", ""

 

 

 def train_embedding(*args):

 

     assert not shared.cmd_opts.lowvram, 'Training models with lowvram not possible'

 

+    apply_optimizations = shared.opts.training_xattention_optimizations

     try:

-        sd_hijack.undo_optimizations()

+        if not apply_optimizations:

+            sd_hijack.undo_optimizations()

 

         embedding, filename = modules.textual_inversion.textual_inversion.train_embedding(*args)

 

@@ -38,5 +40,6 @@ Embedding saved to {html.escape(filename)}
     except Exception:

         raise

     finally:

-        sd_hijack.apply_optimizations()

+        if not apply_optimizations:

+            sd_hijack.apply_optimizations()