Merge pull request #99 from ddPn08/sdxl

support sdxl
ddPn08 · Jul 7, 2023 · fcdf5d9 · fcdf5d9
2 parents 4b19bad + 6fdca66
commit fcdf5d9
Show file tree

Hide file tree

Showing 15 changed files with 462 additions and 1,627 deletions.
diff --git a/modules/config.py b/modules/config.py
@@ -45,7 +45,6 @@
 
 parser.add_argument("--xformers", action="store_true")
 parser.add_argument("--tensorrt", action="store_true")
-parser.add_argument("--deepfloyd_if", action="store_true")
 
 cmd_opts, _ = parser.parse_known_args(
     os.environ["COMMANDLINE_ARGS"].split(" ")

diff --git a/modules/diffusion/networks/__init__.py b/modules/diffusion/networks/__init__.py
@@ -3,7 +3,6 @@
 from glob import glob
 from typing import *
 
-import losalina.hypernetwork
 import torch
 
 from api.events import event_handler
@@ -12,8 +11,7 @@
 from modules.logger import logger
 from modules.shared import ROOT_DIR
 
-from . import lora, lyco
-from .hypernetwork import hijack_hypernetwork
+from . import lyco
 
 latest_networks: List[Tuple[str, torch.nn.Module]] = []
 
@@ -84,13 +82,10 @@ def load_network_modules(e: LoadResourceEvent):
         multiplier = float(multiplier)
         if module_type == "lora":
             filepath = find_network_filepath(basename, "lora")
-            network_module = lora
+            network_module = lyco
         elif module_type == "lyco":
             filepath = find_network_filepath(basename, "lycoris")
             network_module = lyco
-        elif module_type == "hypernet":
-            filepath = find_network_filepath(basename, "hypernetwork")
-            network_module = losalina.hypernetwork
         else:
             continue
 
@@ -121,4 +116,4 @@ def load_network_modules(e: LoadResourceEvent):
 
 
 def init():
-    hijack_hypernetwork()
+    pass
diff --git a/modules/diffusion/networks/hypernetwork/__init__.py b/modules/diffusion/networks/hypernetwork/__init__.py
diff --git a/modules/diffusion/networks/hypernetwork/attentions.py b/modules/diffusion/networks/hypernetwork/attentions.py