Merge branch 'ui-selection-for-cross-attention-optimization' into dev

1 files changed, 10 insertions, 0 deletions

diff --git a/webui.py b/webui.py
index 5c89a3b8..a76e377c 100644
--- a/webui.py
+++ b/webui.py
@@ -53,6 +53,7 @@ import modules.img2img
 import modules.lowvram

 import modules.scripts

 import modules.sd_hijack

+import modules.sd_hijack_optimizations

 import modules.sd_models

 import modules.sd_vae

 import modules.txt2img

@@ -224,6 +225,7 @@ def configure_opts_onchange():
     shared.opts.onchange("sd_vae_as_default", wrap_queued_call(lambda: modules.sd_vae.reload_vae_weights()), call=False)

     shared.opts.onchange("temp_dir", ui_tempdir.on_tmpdir_changed)

     shared.opts.onchange("gradio_theme", shared.reload_gradio_theme)

+    shared.opts.onchange("cross_attention_optimization", wrap_queued_call(lambda: modules.sd_hijack.model_hijack.redo_hijack(shared.sd_model)), call=False)

     startup_timer.record("opts onchange")

 

 

@@ -283,6 +285,10 @@ def initialize_rest(*, reload_script_modules=False):
     modules.textual_inversion.textual_inversion.list_textual_inversion_templates()

     startup_timer.record("refresh textual inversion templates")

 

+    modules.script_callbacks.on_list_optimizers(modules.sd_hijack_optimizations.list_optimizers)

+    modules.sd_hijack.list_optimizers()

+    startup_timer.record("scripts list_optimizers")

+

     # load model in parallel to other startup stuff

     # (when reloading, this does nothing)

     Thread(target=lambda: shared.sd_model).start()

@@ -447,6 +453,10 @@ def webui():
         startup_timer.record("scripts unloaded callback")

         initialize_rest(reload_script_modules=True)

 

+        modules.script_callbacks.on_list_optimizers(modules.sd_hijack_optimizations.list_optimizers)

+        modules.sd_hijack.list_optimizers()

+        startup_timer.record("scripts list_optimizers")

+

 

 if __name__ == "__main__":

     if cmd_opts.nowebui: