Merge branch 'master' into dev

This commit is contained in:
AUTOMATIC 2023-05-14 13:36:16 +03:00
commit 7001e1ed61
2 changed files with 7 additions and 1 deletions

View File

@ -1,4 +1,4 @@
## Upcoming 1.2.1 ## 1.2.1
### Features: ### Features:
* add an option to always refer to lora by filenames * add an option to always refer to lora by filenames
@ -8,6 +8,8 @@
* fix upscalers disappearing after the user reloads UI * fix upscalers disappearing after the user reloads UI
* allow bf16 in safe unpickler (resolves problems with loading some loras) * allow bf16 in safe unpickler (resolves problems with loading some loras)
* allow web UI to be ran fully offline * 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 ## 1.2.0

View File

@ -132,6 +132,10 @@ def load_lora(name, filename):
sd = sd_models.read_state_dict(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 = {} keys_failed_to_match = {}
is_sd2 = 'model_transformer_resblocks' in shared.sd_model.lora_layer_mapping is_sd2 = 'model_transformer_resblocks' in shared.sd_model.lora_layer_mapping