mute SDXL imports in the place there SDXL is imported for the first time instead of launch.py

2 files changed, 17 insertions, 18 deletions

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 183730d2..01ea7c91 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -224,22 +224,6 @@ def run_extensions_installers(settings_file):
         run_extension_installer(os.path.join(extensions_dir, dirname_extension))

 

 

-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

-

-

-

 def prepare_environment():

     torch_index_url = os.environ.get('TORCH_INDEX_URL', "https://download.pytorch.org/whl/cu118")

     torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.0.1 torchvision==0.15.2 --extra-index-url {torch_index_url}")

@@ -356,8 +340,6 @@ def configure_for_tests():
 

 

 def start():

-    mute_sdxl_imports()

-

     print(f"Launching {'API server' if '--nowebui' in sys.argv else 'Web UI'} with arguments: {' '.join(sys.argv[1:])}")

     import webui

     if '--nowebui' in sys.argv:

diff --git a/modules/paths.py b/modules/paths.py
index c6f8904e..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,6 +33,8 @@ 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"]),