Merge branch 'dev' into patch-1

1 files changed, 6 insertions, 6 deletions

diff --git a/launch.py b/launch.py
index b8f650fc..8865af9a 100644
--- a/launch.py
+++ b/launch.py
@@ -120,12 +120,12 @@ def run_python(code, desc=None, errdesc=None):
     return run(f'"{python}" -c "{code}"', desc, errdesc)

 

 

-def run_pip(args, desc=None):

+def run_pip(args, desc=None, live=False):

     if "--skip-install" in sys.argv:

         return

 

     index_url_line = f' --index-url {index_url}' if index_url != '' else ''

-    return run(f'"{python}" -m pip {args} --prefer-binary{index_url_line}', desc=f"Installing {desc}", errdesc=f"Couldn't install {desc}")

+    return run(f'"{python}" -m pip {args} --prefer-binary{index_url_line}', desc=f"Installing {desc}", errdesc=f"Couldn't install {desc}", live=live)

 

 

 def check_run_python(code):

@@ -222,10 +222,10 @@ def run_extensions_installers(settings_file):
 

 

 def prepare_environment():

-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 --extra-index-url https://download.pytorch.org/whl/cu117")

+    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==2.0.0 torchvision==0.15.1 --index-url https://download.pytorch.org/whl/cu118")

     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")

 

-    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.16rc425')

+    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17')

     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")

     openclip_package = os.environ.get('OPENCLIP_PACKAGE', "git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b")

@@ -268,7 +268,7 @@ def prepare_environment():
     if (not is_installed("xformers") or args.reinstall_xformers) and args.xformers:

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

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

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

+                run_pip(f"install -U -I --no-deps {xformers_package}", "xformers", live=True)

             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")

@@ -293,7 +293,7 @@ def prepare_environment():
 

     if not os.path.isfile(requirements_file):

         requirements_file = os.path.join(script_path, requirements_file)

-    run_pip(f"install -r \"{requirements_file}\"", "requirements for Web UI")

+    run_pip(f"install -r \"{requirements_file}\"", "requirements")

 

     run_extensions_installers(settings_file=args.ui_settings_file)