Merge pull request #9191 from vladmandic/torch

update torch base environment

7 files changed, 15 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index 0b1d17ca..3b48ba9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,4 @@ notification.mp3
 /extensions
 /test/stdout.txt
 /test/stderr.txt
-/cache.json
+/cache.json*
diff --git a/environment-wsl2.yaml b/environment-wsl2.yaml
index f8872750..0c4ae680 100644
--- a/environment-wsl2.yaml
+++ b/environment-wsl2.yaml
@@ -4,8 +4,8 @@ channels:
   - defaults
 dependencies:
   - python=3.10
-  - pip=22.2.2
-  - cudatoolkit=11.3
-  - pytorch=1.12.1
-  - torchvision=0.13.1
-  - numpy=1.23.1
\ No newline at end of file
+  - pip=23.0
+  - cudatoolkit=11.8
+  - pytorch=2.0
+  - torchvision=0.15
+  - numpy=1.23
diff --git a/launch.py b/launch.py
index 68e08114..4256ef25 100644
--- a/launch.py
+++ b/launch.py
@@ -225,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 torchvision --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")

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

 

diff --git a/requirements.txt b/requirements.txt
index 77954b8d..9091f612 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+astunparse

 blendmodes

 accelerate

 basicsr

diff --git a/requirements_versions.txt b/requirements_versions.txt
index 0a62c6de..52bd9b4d 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,10 +1,10 @@
 blendmodes==2022

 transformers==4.25.1

-accelerate==0.12.0

+accelerate==0.18.0

 basicsr==1.4.2

 gfpgan==1.3.8

 gradio==3.27

-numpy==1.23.3

+numpy==1.23.5

 Pillow==9.4.0

 realesrgan==0.3.0

 torch

diff --git a/webui-macos-env.sh b/webui-macos-env.sh
index 37cac4fb..65d80413 100644
--- a/webui-macos-env.sh
+++ b/webui-macos-env.sh
@@ -11,7 +11,7 @@ fi
 
 export install_dir="$HOME"
 export COMMANDLINE_ARGS="--skip-torch-cuda-test --upcast-sampling --no-half-vae --use-cpu interrogate"
-export TORCH_COMMAND="pip install torch==1.12.1 torchvision==0.13.1"
+export TORCH_COMMAND="pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/cu118"
 export K_DIFFUSION_REPO="https://github.com/brkirch/k-diffusion.git"
 export K_DIFFUSION_COMMIT_HASH="51c9778f269cedb55a4d88c79c0246d35bdadb71"
 export PYTORCH_ENABLE_MPS_FALLBACK=1
diff --git a/webui.py b/webui.py
index 0e2a3df0..1f97b475 100644
--- a/webui.py
+++ b/webui.py
@@ -20,6 +20,8 @@ startup_timer = timer.Timer()
 import torch

 import pytorch_lightning # pytorch_lightning should be imported after torch, but it re-enables warnings on import so import once to disable them

 warnings.filterwarnings(action="ignore", category=DeprecationWarning, module="pytorch_lightning")

+warnings.filterwarnings(action="ignore", category=UserWarning, module="torchvision")

+

 startup_timer.record("import torch")

 

 import gradio