diff --git a/modules/lora/lora_load.py b/modules/lora/lora_load.py index 0f2ef570c..6bcf314ab 100644 --- a/modules/lora/lora_load.py +++ b/modules/lora/lora_load.py @@ -277,7 +277,7 @@ def network_load(names, te_multipliers=None, unet_multipliers=None, dyn_dims=Non if recompile_model: shared.compiled_model_state.lora_model.append(f"{name}:{te_multipliers[i] if te_multipliers else shared.opts.extra_networks_default_multiplier}") lora_method = lora_overrides.get_method(shorthash) - if shared.opts.lora_force_diffusers or lora_method == 'diffusers': # OpenVINO only works with Diffusers LoRa loading + if lora_method == 'diffusers': net = load_diffusers(name, network_on_disk, lora_scale=te_multipliers[i] if te_multipliers else shared.opts.extra_networks_default_multiplier) elif lora_method == 'nunchaku': pass # handled directly from extra_networks_lora.load_nunchaku diff --git a/modules/lora/lora_overrides.py b/modules/lora/lora_overrides.py index d914f3793..61f2dad46 100644 --- a/modules/lora/lora_overrides.py +++ b/modules/lora/lora_overrides.py @@ -56,7 +56,7 @@ fuse_ignore = [ def get_method(shorthash=''): - use_diffusers = (shared.sd_model_type in force_models_diffusers) or (shared.sd_model.__class__.__name__ in force_classes_diffusers) + use_diffusers = shared.opts.lora_force_diffusers or (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: diff --git a/modules/lora/networks.py b/modules/lora/networks.py index 107b6cff8..f03063e2d 100644 --- a/modules/lora/networks.py +++ b/modules/lora/networks.py @@ -15,6 +15,7 @@ def network_activate(include=[], exclude=[]): if shared.opts.diffusers_offload_mode == "sequential": sd_models.disable_offload(sd_model) sd_models.move_model(sd_model, device=devices.cpu) + device = None modules = {} components = include if len(include) > 0 else ['text_encoder', 'text_encoder_2', 'text_encoder_3', 'unet', 'transformer'] components = [x for x in components if x not in exclude]