diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e9d834ff..7cb2c92c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -133,6 +133,7 @@ it is time to give credit to original [author](https://github.com/auTOMATIC1111) - **Fixes**: - Update requirements - Prompt params parser + - Allowing forcing LoRA loading method for some or all models - Image save without metadata - API generate save metadata - Face/InstantID faults diff --git a/extensions-builtin/Lora/network_overrides.py b/extensions-builtin/Lora/network_overrides.py index c8271b431..d180cc509 100644 --- a/extensions-builtin/Lora/network_overrides.py +++ b/extensions-builtin/Lora/network_overrides.py @@ -20,6 +20,8 @@ force_diffusers = [ ] def check_override(shorthash): + if not shared.opts.lora_maybe_diffusers: + return False if len(shorthash) < 4: return False force = any([x.startswith(shorthash) for x in force_diffusers]) diff --git a/modules/shared.py b/modules/shared.py index 06b9bc7cb..e50521787 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -806,7 +806,8 @@ options_templates.update(options_section(('extra_networks', "Extra Networks"), { "extra_networks_styles": OptionInfo(True, "Show built-in styles"), "lora_preferred_name": OptionInfo("filename", "LoRA preferred name", gr.Radio, {"choices": ["filename", "alias"]}), "lora_add_hashes_to_infotext": OptionInfo(True, "LoRA add hash info"), - "lora_force_diffusers": OptionInfo(False if not cmd_opts.use_openvino else True, "LoRA use alternative loading method"), + "lora_force_diffusers": OptionInfo(False if not cmd_opts.use_openvino else True, "LoRA force loading of all models using Diffusers"), + "lora_maybe_diffusers": OptionInfo(False, "LoRA force loading of specific models using Diffusers"), "lora_fuse_diffusers": OptionInfo(False if not cmd_opts.use_openvino else True, "LoRA use merge when using alternative method"), "lora_in_memory_limit": OptionInfo(1 if not cmd_opts.use_openvino else 0, "LoRA memory cache", gr.Slider, {"minimum": 0, "maximum": 24, "step": 1}), "lora_functional": OptionInfo(False, "Use Kohya method for handling multiple LoRA", gr.Checkbox, { "visible": False }),