Merge branch 'dev' into remove-watermark-option

1 files changed, 11 insertions, 7 deletions

diff --git a/launch.py b/launch.py
index c41ae82d..af1c8309 100644
--- a/launch.py
+++ b/launch.py
@@ -121,12 +121,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:

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

@@ -206,6 +206,10 @@ def list_extensions(settings_file):
         print(e, file=sys.stderr)

 

     disabled_extensions = set(settings.get('disabled_extensions', []))

+    disable_all_extensions = settings.get('disable_all_extensions', 'none')

+

+    if disable_all_extensions != 'none':

+        return []

 

     return [x for x in os.listdir(extensions_dir) if x not in disabled_extensions]

 

@@ -221,10 +225,10 @@ def run_extensions_installers(settings_file):
 def prepare_environment():

     global skip_install

 

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

@@ -235,7 +239,7 @@ def prepare_environment():
     codeformer_repo = os.environ.get('CODEFORMER_REPO', 'https://github.com/sczhou/CodeFormer.git')

     blip_repo = os.environ.get('BLIP_REPO', 'https://github.com/salesforce/BLIP.git')

 

-    stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "47b6b607fdd31875c9279cd2f4f16b92e4ea958e")

+    stable_diffusion_commit_hash = os.environ.get('STABLE_DIFFUSION_COMMIT_HASH', "cf1d67a6fd5ea1aa600c4df58e5b47da45f6bdbf")

     taming_transformers_commit_hash = os.environ.get('TAMING_TRANSFORMERS_COMMIT_HASH', "24268930bf1dce879235a7fddd0b2355b84d7ea6")

     k_diffusion_commit_hash = os.environ.get('K_DIFFUSION_COMMIT_HASH', "5b3af030dd83e0297272d861c19477735d0317ec")

     codeformer_commit_hash = os.environ.get('CODEFORMER_COMMIT_HASH', "c5b4593074ba6214284d6acd5f1719b6c5d739af")

@@ -267,7 +271,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")

@@ -292,7 +296,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)