Merge branch 'release_candidate'

1 files changed, 10 insertions, 0 deletions

diff --git a/extensions-builtin/Lora/lora.py b/extensions-builtin/Lora/lora.py
index ba1293df..b5d0c98f 100644
--- a/extensions-builtin/Lora/lora.py
+++ b/extensions-builtin/Lora/lora.py
@@ -133,6 +133,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

 

@@ -393,6 +397,8 @@ def lora_MultiheadAttention_load_state_dict(self, *args, **kwargs):
 def list_available_loras():

     available_loras.clear()

     available_lora_aliases.clear()

+    forbidden_lora_aliases.clear()

+    forbidden_lora_aliases.update({"none": 1})

 

     os.makedirs(shared.cmd_opts.lora_dir, exist_ok=True)

 

@@ -406,6 +412,9 @@ def list_available_loras():
 

         available_loras[name] = entry

 

+        if entry.alias in available_lora_aliases:

+            forbidden_lora_aliases[entry.alias.lower()] = 1

+

         available_lora_aliases[name] = entry

         available_lora_aliases[entry.alias] = entry

 

@@ -445,6 +454,7 @@ def infotext_pasted(infotext, params):
 

 available_loras = {}

 available_lora_aliases = {}

+forbidden_lora_aliases = {}

 loaded_loras = []

 

 list_available_loras()