From b186045fee0d384addcdc2a759fd33dba51b070e Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 23 May 2023 18:02:09 +0300
Subject: possible fix for empty list of optimizations #10605

---
 modules/sd_hijack.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/sd_hijack.py b/modules/sd_hijack.py
index 08d31080..f93df0a6 100644
--- a/modules/sd_hijack.py
+++ b/modules/sd_hijack.py
@@ -48,6 +48,11 @@ def apply_optimizations():
 
     undo_optimizations()
 
+    if len(optimizers) == 0:
+        # a script can access the model very early, and optimizations would not be filled by then
+        current_optimizer = None
+        return ''
+
     ldm.modules.diffusionmodules.model.nonlinearity = silu
     ldm.modules.diffusionmodules.openaimodel.th = sd_hijack_unet.th
 
@@ -67,8 +72,9 @@ def apply_optimizations():
         matching_optimizer = optimizers[0]
 
     if matching_optimizer is not None:
-        print(f"Applying optimization: {matching_optimizer.name}")
+        print(f"Applying optimization: {matching_optimizer.name}... ", end='')
         matching_optimizer.apply()
+        print("done.")
         current_optimizer = matching_optimizer
         return current_optimizer.name
     else:
@@ -149,6 +155,13 @@ class StableDiffusionModelHijack:
     def __init__(self):
         self.embedding_db.add_embedding_dir(cmd_opts.embeddings_dir)
 
+    def apply_optimizations(self):
+        try:
+            self.optimization_method = apply_optimizations()
+        except Exception as e:
+            errors.display(e, "applying cross attention optimization")
+            undo_optimizations()
+
     def hijack(self, m):
         if type(m.cond_stage_model) == xlmr.BertSeriesModelWithTransformation:
             model_embeddings = m.cond_stage_model.roberta.embeddings
@@ -168,11 +181,7 @@ class StableDiffusionModelHijack:
         if m.cond_stage_key == "edit":
             sd_hijack_unet.hijack_ddpm_edit()
 
-        try:
-            self.optimization_method = apply_optimizations()
-        except Exception as e:
-            errors.display(e, "applying cross attention optimization")
-            undo_optimizations()
+        self.apply_optimizations()
 
         self.clip = m.cond_stage_model
 
-- 
cgit v1.2.1


From 6095ade1479d5f86f5fc62872af1efde922905dc Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 27 May 2023 19:06:49 +0300
Subject: fix serving images that have already been saved without temp files
 function that broke after updating gradio

---
 modules/ui_tempdir.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/ui_tempdir.py b/modules/ui_tempdir.py
index f05049e1..7f6b42ae 100644
--- a/modules/ui_tempdir.py
+++ b/modules/ui_tempdir.py
@@ -4,6 +4,7 @@ from collections import namedtuple
 from pathlib import Path
 
 import gradio as gr
+import gradio.components
 
 from PIL import PngImagePlugin
 
@@ -31,13 +32,16 @@ def check_tmp_file(gradio, filename):
     return False
 
 
-def save_pil_to_file(pil_image, dir=None):
+def save_pil_to_file(self, pil_image, dir=None):
     already_saved_as = getattr(pil_image, 'already_saved_as', None)
     if already_saved_as and os.path.isfile(already_saved_as):
         register_tmp_file(shared.demo, already_saved_as)
+        filename = already_saved_as
 
-        file_obj = Savedfile(f'{already_saved_as}?{os.path.getmtime(already_saved_as)}')
-        return file_obj
+        if not shared.opts.save_images_add_number:
+            filename += f'?{os.path.getmtime(already_saved_as)}'
+
+        return filename
 
     if shared.opts.temp_dir != "":
         dir = shared.opts.temp_dir
@@ -51,11 +55,11 @@ def save_pil_to_file(pil_image, dir=None):
 
     file_obj = tempfile.NamedTemporaryFile(delete=False, suffix=".png", dir=dir)
     pil_image.save(file_obj, pnginfo=(metadata if use_metadata else None))
-    return file_obj
+    return file_obj.name
 
 
 # override save to file function so that it also writes PNG info
-gr.processing_utils.save_pil_to_file = save_pil_to_file
+gradio.components.IOComponent.pil_to_temp_file = save_pil_to_file
 
 
 def on_tmpdir_changed():
-- 
cgit v1.2.1


From 20ae71faa8ef035c31aa3a410b707d792c8203a3 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 27 May 2023 20:23:16 +0300
Subject: fix linter issue for 1.3.0

---
 modules/ui_tempdir.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules')

diff --git a/modules/ui_tempdir.py b/modules/ui_tempdir.py
index 7f6b42ae..9fc7d764 100644
--- a/modules/ui_tempdir.py
+++ b/modules/ui_tempdir.py
@@ -3,7 +3,6 @@ import tempfile
 from collections import namedtuple
 from pathlib import Path
 
-import gradio as gr
 import gradio.components
 
 from PIL import PngImagePlugin
-- 
cgit v1.2.1