diff --git a/modules/lora/extra_networks_lora.py b/modules/lora/extra_networks_lora.py index 404a9ef53..40982caac 100644 --- a/modules/lora/extra_networks_lora.py +++ b/modules/lora/extra_networks_lora.py @@ -146,7 +146,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): sd_model.loaded_loras = {} key = f'{",".join(include)}:{",".join(exclude)}' loaded = sd_model.loaded_loras.get(key, []) - # shared.log.trace(f'Network load: type=LoRA key="{key}" requested={requested} loaded={loaded}') + debug_log(f'Network load: type=LoRA key="{key}" requested={requested} loaded={loaded}') if len(requested) != len(loaded): sd_model.loaded_loras[key] = requested return True @@ -184,7 +184,7 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): elif load_method == 'nunchaku': from modules.lora import lora_nunchaku has_changed = lora_nunchaku.load_nunchaku(names, unet_multipliers) - else: + else: # native lora_load.network_load(names, te_multipliers, unet_multipliers, dyn_dims) # load has_changed = self.changed(requested, include, exclude) if has_changed: diff --git a/modules/lora/lora_load.py b/modules/lora/lora_load.py index aed455423..1a38f8787 100644 --- a/modules/lora/lora_load.py +++ b/modules/lora/lora_load.py @@ -115,7 +115,7 @@ def load_safetensors(name, network_on_disk) -> Union[network.Network, None]: if l.debug: shared.log.debug(f'Network load: type=LoRA name="{name}" unmatched={keys_failed_to_match}') else: - shared.log.debug(f'Network load: type=LoRA name="{name}" type={set(network_types)} keys={len(matched_networks)} dtypes={dtypes} direct={shared.opts.lora_fuse_diffusers}') + shared.log.debug(f'Network load: type=LoRA name="{name}" type={set(network_types)} keys={len(matched_networks)} dtypes={dtypes} fuse={shared.opts.lora_fuse_diffusers}') if len(matched_networks) == 0: return None lora_cache[name] = net diff --git a/modules/lora/lora_overrides.py b/modules/lora/lora_overrides.py index 64a391c94..0e16c1254 100644 --- a/modules/lora/lora_overrides.py +++ b/modules/lora/lora_overrides.py @@ -50,8 +50,11 @@ fuse_ignore = [ def get_method(shorthash=''): - use_diffusers = len(shorthash) < 4 or (shared.sd_model_type in force_models_diffusers) or (shared.sd_model.__class__.__name__ in force_classes_diffusers) - use_diffusers = use_diffusers or (any(x.startswith(shorthash) for x in maybe_diffusers) if shared.opts.lora_maybe_diffusers else False) or any(x.startswith(shorthash) for x in force_diffusers) + use_diffusers = (shared.sd_model_type in force_models_diffusers) or (shared.sd_model.__class__.__name__ in force_classes_diffusers) + if shared.opts.lora_maybe_diffusers and len(shorthash) > 4: + use_diffusers = use_diffusers or any(x.startswith(shorthash) for x in maybe_diffusers) + if shared.opts.lora_force_diffusers and len(shorthash) > 4: + use_diffusers = use_diffusers or any(x.startswith(shorthash) for x in force_diffusers) use_nunchaku = hasattr(shared.sd_model, 'transformer') and 'Nunchaku' in shared.sd_model.transformer.__class__.__name__ if use_nunchaku: return 'nunchaku' diff --git a/wiki b/wiki index c586c1d9c..7311b7315 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit c586c1d9c485775d33ba4dde145f8d98462cf3aa +Subproject commit 7311b731564c1616e766b5ba2b29018561adfb10