diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py index a3113f54b..64ec2b74d 100644 --- a/extensions-builtin/Lora/networks.py +++ b/extensions-builtin/Lora/networks.py @@ -193,10 +193,13 @@ def load_networks(names, te_multipliers=None, unet_multipliers=None, dyn_dims=No try: if recompile_model: shared.compiled_model_state.lora_model.append(f"{name}:{te_multipliers[i] if te_multipliers else 1.0}") - if shared.backend == shared.Backend.DIFFUSERS and shared.opts.lora_force_diffusers: # OpenVINO only works with Diffusers LoRa loading. - # or getattr(network_on_disk, 'shorthash', '').lower() == 'aaebf6360f7d' # sd15-lcm - # or getattr(network_on_disk, 'shorthash', '').lower() == '3d18b05e4f56' # sdxl-lcm - # or getattr(network_on_disk, 'shorthash', '').lower() == '813ea5fb1c67' # turbo sdxl-turbo + shorthash = getattr(network_on_disk, 'shorthash', '').lower() + if shared.backend == shared.Backend.DIFFUSERS and (shared.opts.lora_force_diffusers # OpenVINO only works with Diffusers LoRa loading. + or shorthash == 'aaebf6360f7d' # sd15-lcm + or shorthash == '3d18b05e4f56' # sdxl-lcm + or shorthash == 'b71dcb732467' # sdxl-tcd + or shorthash == '813ea5fb1c67' # sdxl-turbo + ): net = load_diffusers(name, network_on_disk, lora_scale=te_multipliers[i] if te_multipliers else 1.0) else: net = load_network(name, network_on_disk) diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet index ecd33eb82..75ac3803f 160000 --- a/extensions-builtin/sd-webui-controlnet +++ b/extensions-builtin/sd-webui-controlnet @@ -1 +1 @@ -Subproject commit ecd33eb82b25c77cec3185cc9647db904fcb7c03 +Subproject commit 75ac3803feae51e6edf50f6bf76919b202629598 diff --git a/modules/ui.py b/modules/ui.py index b059bbd36..03f7ddda6 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -3,7 +3,7 @@ import mimetypes import gradio as gr import gradio.routes import gradio.utils -from modules.call_queue import wrap_gradio_call +from modules.call_queue import wrap_gradio_call, wrap_gradio_gpu_call # pylint: disable=unused-import from modules import timer, gr_hijack, shared, theme, sd_models, script_callbacks, modelloader, ui_common, ui_loadsave, ui_symbols, ui_javascript, generation_parameters_copypaste, call_queue from modules.paths import script_path, data_path # pylint: disable=unused-import from modules.dml import directml_override_opts