Merge branch 'master' into focal-point-cropping

1 files changed, 9 insertions, 3 deletions

diff --git a/launch.py b/launch.py
index 7b15e78e..8affd410 100644
--- a/launch.py
+++ b/launch.py
@@ -111,7 +111,7 @@ def prepare_enviroment():
 

     gfpgan_package = os.environ.get('GFPGAN_PACKAGE', "git+https://github.com/TencentARC/GFPGAN.git@8d2447a2d918f8eba5a4a01463fd48e45126a379")

     clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")

-    deepdanbooru_package = os.environ.get('DEEPDANBOORU_PACKAGE', "git+https://github.com/KichangKim/DeepDanbooru.git@edf73df4cdaeea2cf00e9ac08bd8a9026b7a7b26")

+    deepdanbooru_package = os.environ.get('DEEPDANBOORU_PACKAGE', "git+https://github.com/KichangKim/DeepDanbooru.git@d91a2963bf87c6a770d74894667e9ffa9f6de7ff")

 

     xformers_windows_package = os.environ.get('XFORMERS_WINDOWS_PACKAGE', 'https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl')

 

@@ -156,9 +156,15 @@ def prepare_enviroment():
     if not is_installed("clip"):

         run_pip(f"install {clip_package}", "clip")

 

-    if (not is_installed("xformers") or reinstall_xformers) and xformers and platform.python_version().startswith("3.10"):

+    if (not is_installed("xformers") or reinstall_xformers) and xformers:

         if platform.system() == "Windows":

-            run_pip(f"install -U -I --no-deps {xformers_windows_package}", "xformers")

+            if platform.python_version().startswith("3.10"):

+                run_pip(f"install -U -I --no-deps {xformers_windows_package}", "xformers")

+            else:

+                print("Installation of xformers is not supported in this version of Python.")

+                print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")

+                if not is_installed("xformers"):

+                    exit(0)

         elif platform.system() == "Linux":

             run_pip("install xformers", "xformers")