Merge branch 'release_candidate'

1 files changed, 25 insertions, 14 deletions

diff --git a/modules/paths.py b/modules/paths.py
index 5171df4f..25052339 100644
--- a/modules/paths.py
+++ b/modules/paths.py
@@ -5,6 +5,21 @@ from modules.paths_internal import models_path, script_path, data_path, extensio
 import modules.safe  # noqa: F401

 

 

+def mute_sdxl_imports():

+    """create fake modules that SDXL wants to import but doesn't actually use for our purposes"""

+

+    class Dummy:

+        pass

+

+    module = Dummy()

+    module.LPIPS = None

+    sys.modules['taming.modules.losses.lpips'] = module

+

+    module = Dummy()

+    module.StableDataModuleFromConfig = None

+    sys.modules['sgm.data'] = module

+

+

 # data_path = cmd_opts_pre.data

 sys.path.insert(0, script_path)

 

@@ -18,8 +33,11 @@ for possible_sd_path in possible_sd_paths:
 

 assert sd_path is not None, f"Couldn't find Stable Diffusion in any of: {possible_sd_paths}"

 

+mute_sdxl_imports()

+

 path_dirs = [

     (sd_path, 'ldm', 'Stable Diffusion', []),

+    (os.path.join(sd_path, '../generative-models'), 'sgm', 'Stable Diffusion XL', ["sgm"]),

     (os.path.join(sd_path, '../CodeFormer'), 'inference_codeformer.py', 'CodeFormer', []),

     (os.path.join(sd_path, '../BLIP'), 'models/blip.py', 'BLIP', []),

     (os.path.join(sd_path, '../k-diffusion'), 'k_diffusion/sampling.py', 'k_diffusion', ["atstart"]),

@@ -35,20 +53,13 @@ for d, must_exist, what, options in path_dirs:
         d = os.path.abspath(d)

         if "atstart" in options:

             sys.path.insert(0, d)

+        elif "sgm" in options:

+            # Stable Diffusion XL repo has scripts dir with __init__.py in it which ruins every extension's scripts dir, so we

+            # import sgm and remove it from sys.path so that when a script imports scripts.something, it doesbn't use sgm's scripts dir.

+

+            sys.path.insert(0, d)

+            import sgm  # noqa: F401

+            sys.path.pop(0)

         else:

             sys.path.append(d)

         paths[what] = d

-

-

-class Prioritize:

-    def __init__(self, name):

-        self.name = name

-        self.path = None

-

-    def __enter__(self):

-        self.path = sys.path.copy()

-        sys.path = [paths[self.name]] + sys.path

-

-    def __exit__(self, exc_type, exc_val, exc_tb):

-        sys.path = self.path

-        self.path = None