lycoris-lora 2.1.0.dev6__tar.gz → 2.1.0.dev8__tar.gz

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lycoris_lora
-Version: 2.1.0.dev6
+Version: 2.1.0.dev8
 Summary: Lora beYond Conventional methods, Other Rank adaptation Implementations for Stable diffusion
 Home-page: https://github.com/KohakuBlueleaf/LyCORIS
 Author: Shih-Ying Yeh(KohakuBlueLeaf), Yu-Guan Hsieh, Zhidong Gao

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/lycoris/kohya/__init__.py

@@ -4,13 +4,14 @@
 # https://github.com/cloneofsimo/lora/blob/master/lora_diffusion/lora.py
 # https://github.com/kohya-ss/sd-scripts/blob/main/networks/lora.py
 
-import math
-from warnings import warn
 import os
+import re
 import sys
+from warnings import warn
+from typing import List
 
 sys.setrecursionlimit(10000)
-from typing import List
+
 import torch
 import torch.utils.checkpoint as checkpoint
 
@@ -482,7 +483,9 @@ class LycorisNetworkKohya(LycorisNetwork):
                         ]
                     )
                     next_config = {}
-                elif name in target_replace_names:
+                elif name in target_replace_names or any(
+                    re.match(t, name) for t in target_replace_names
+                ):
                     if name in self.NAME_ALGO_MAP:
                         next_config = self.NAME_ALGO_MAP[name]
                         algo = next_config.get("algo", network_module)

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/lycoris/modules/locon.py

@@ -96,9 +96,12 @@ class LoConModule(ModuleCustomSD):
         self.multiplier = multiplier
         self.org_module = [org_module]
         self.org_forward = self.org_module[0].forward
-        self.register_load_state_dict_post_hook(self.load_weight_hook)
 
-    def load_weight_hook(self, *args, **kwargs):
+    def load_weight_hook(self, module: nn.Module, incompatible_keys):
+        missing_keys = incompatible_keys.missing_keys
+        for key in missing_keys:
+            if "scalar" in key:
+                del missing_keys[missing_keys.index(key)]
         self.scalar = nn.Parameter(torch.ones_like(self.scalar))
 
     def apply_to(self, is_hypernet=False, **kwargs):

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/lycoris/modules/loha.py

@@ -194,8 +194,9 @@ class LohaModule(ModuleCustomSD):
 
     def load_weight_hook(self, module: nn.Module, incompatible_keys):
         missing_keys = incompatible_keys.missing_keys
-        if "scalar" in missing_keys:
-            del missing_keys[missing_keys.index("scalar")]
+        for key in missing_keys:
+            if "scalar" in key:
+                del missing_keys[missing_keys.index(key)]
         self.scalar = nn.Parameter(torch.ones_like(self.scalar))
 
     def apply_to(self):

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/lycoris/modules/lokr.py

@@ -236,9 +236,12 @@ class LokrModule(ModuleCustomSD):
             torch.tensor(self.multiplier * self.scale),
         )
         assert torch.sum(torch.isnan(weight)) == 0, "weight is nan"
-        self.register_load_state_dict_post_hook(self.load_weight_hook)
 
-    def load_weight_hook(self, *args, **kwargs):
+    def load_weight_hook(self, module: nn.Module, incompatible_keys):
+        missing_keys = incompatible_keys.missing_keys
+        for key in missing_keys:
+            if "scalar" in key:
+                del missing_keys[missing_keys.index(key)]
         self.scalar = nn.Parameter(torch.ones_like(self.scalar))
 
     # Same as locon.py

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/lycoris/utils/__init__.py

@@ -230,12 +230,14 @@ def extract_diff(
                         extract_c.detach().cpu().contiguous().half()
                     )
                     diff = (
-                        root_weight
-                        - torch.einsum(
-                            "i j k l, j r, p i -> p r k l",
-                            extract_c,
-                            extract_a.flatten(1, -1),
-                            extract_b.flatten(1, -1),
+                        (
+                            root_weight
+                            - torch.einsum(
+                                "i j k l, j r, p i -> p r k l",
+                                extract_c,
+                                extract_a.flatten(1, -1),
+                                extract_b.flatten(1, -1),
+                            )
                         )
                         .detach()
                         .cpu()

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/lycoris_lora.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lycoris-lora
-Version: 2.1.0.dev6
+Version: 2.1.0.dev8
 Summary: Lora beYond Conventional methods, Other Rank adaptation Implementations for Stable diffusion
 Home-page: https://github.com/KohakuBlueleaf/LyCORIS
 Author: Shih-Ying Yeh(KohakuBlueLeaf), Yu-Guan Hsieh, Zhidong Gao

{lycoris_lora-2.1.0.dev6 → lycoris_lora-2.1.0.dev8}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 setup(
     name="lycoris_lora",
     packages=find_packages(),
-    version="2.1.0.dev6",
+    version="2.1.0.dev8",
     url="https://github.com/KohakuBlueleaf/LyCORIS",
     description="Lora beYond Conventional methods, Other Rank adaptation Implementations for Stable diffusion",
     author="Shih-Ying Yeh(KohakuBlueLeaf), Yu-Guan Hsieh, Zhidong Gao",