Commit 7001e1ed authored by AUTOMATIC's avatar AUTOMATIC
Browse files

Merge branch 'master' into dev

parents 1a435240 89f9faa6
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
## Upcoming 1.2.1
## 1.2.1

### Features:
 * add an option to always refer to lora by filenames
@@ -8,6 +8,8 @@
 * fix upscalers disappearing after the user reloads UI
 * allow bf16 in safe unpickler (resolves problems with loading some loras)
 * allow web UI to be ran fully offline
 * fix localizations not working
 * fix error for loras: 'LatentDiffusion' object has no attribute 'lora_layer_mapping'

## 1.2.0

+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@ def load_lora(name, filename):

    sd = sd_models.read_state_dict(filename)

    # this should not be needed but is here as an emergency fix for an unknown error people are experiencing in 1.2.0
    if not hasattr(shared.sd_model, 'lora_layer_mapping'):
        assign_lora_names_to_compvis_modules(shared.sd_model)

    keys_failed_to_match = {}
    is_sd2 = 'model_transformer_resblocks' in shared.sd_model.lora_layer_mapping