Update torch and other dependencies to make it work on 24.04

modules/errors.py

@@ -107,8 +107,8 @@ def check_versions():
     import torch
     import gradio
 
-    expected_torch_version = "2.1.2"
-    expected_xformers_version = "0.0.23.post1"
+    expected_torch_version = "2.3.0"
+    expected_xformers_version = "0.0.26.post1"
     expected_gradio_version = "3.41.2"
 
     if version.parse(torch.__version__) < version.parse(expected_torch_version):

modules/initialize.py

@@ -32,6 +32,9 @@ def imports():
     import sgm.modules.encoders.modules  # noqa: F401
     startup_timer.record("import sgm")
 
+    from modules import initialize_util
+    initialize_util.fix_pytorch_lightning()
+
     from modules import shared_init
     shared_init.initialize()
     startup_timer.record("initialize shared")

modules/launch_utils.py

@@ -316,7 +316,7 @@ def requirements_met(requirements_file):
 
 def prepare_environment():
     torch_index_url = os.environ.get('TORCH_INDEX_URL', "https://download.pytorch.org/whl/cu121")
-    torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.1.2 torchvision==0.16.2 --extra-index-url {torch_index_url}")
+    torch_command = os.environ.get('TORCH_COMMAND', f"pip install torch==2.3.0 torchvision==0.18.0 --extra-index-url {torch_index_url}")
     if args.use_ipex:
         if platform.system() == "Windows":
             # The "Nuullll/intel-extension-for-pytorch" wheels were built from IPEX source for Intel Arc GPU: https://github.com/intel/intel-extension-for-pytorch/tree/xpu-main
@@ -340,9 +340,9 @@ def prepare_environment():
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
     requirements_file_for_npu = os.environ.get('REQS_FILE_FOR_NPU', "requirements_npu.txt")
 
-    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.23.post1')
-    clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip")
-    openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b.zip")
+    xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.26.post1')
+    clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/a1d071733d7111c9c014f024669f959182114e33.zip")
+    openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/9eaf2424e74a4e34f5041e640e5e69bac5eb41aa.zip")
 
     assets_repo = os.environ.get('ASSETS_REPO', "https://github.com/AUTOMATIC1111/stable-diffusion-webui-assets.git")
     stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/Stability-AI/stablediffusion.git")

modules/sd_disable_initialization.py

@@ -65,7 +65,7 @@ def create_model_and_transforms_without_pretrained(*args, pretrained=None, **kwa
             return self.create_model_and_transforms(*args, pretrained=None, **kwargs)
 
         def CLIPTextModel_from_pretrained(pretrained_model_name_or_path, *model_args, **kwargs):
-            res = self.CLIPTextModel_from_pretrained(None, *model_args, config=pretrained_model_name_or_path, state_dict={}, **kwargs)
+            res = self.CLIPTextModel_from_pretrained(pretrained_model_name_or_path, *model_args, config=pretrained_model_name_or_path, state_dict={}, **kwargs)
             res.name_or_path = pretrained_model_name_or_path
             return res
 

requirements.txt

@@ -16,18 +16,20 @@ lark
 numpy
 omegaconf
 open-clip-torch
+spandrel<0.3
 
 piexif
 psutil
 pytorch_lightning
 requests
 resize-right
+pydantic<2
 
 safetensors
 scikit-image>=0.19
 tomesd
 torch
 torchdiffeq
 torchsde
-transformers==4.30.2
+transformers==4.34.1
 pillow-avif-plugin==1.4.3

requirements_versions.txt

@@ -1,32 +1,33 @@
-GitPython==3.1.32
-Pillow==9.5.0
-accelerate==0.21.0
-blendmodes==2022
-clean-fid==0.1.35
-diskcache==5.6.3
-einops==0.4.1
-facexlib==0.3.0
-fastapi==0.94.0
-gradio==3.41.2
-httpcore==0.15
-inflection==0.5.1
-jsonmerge==1.8.0
-kornia==0.6.7
-lark==1.1.2
-numpy==1.26.2
-omegaconf==2.2.3
-open-clip-torch==2.20.0
-piexif==1.1.3
-psutil==5.9.5
-pytorch_lightning==1.9.4
-resize-right==0.0.2
-safetensors==0.4.2
-scikit-image==0.21.0
-spandrel==0.1.6
-tomesd==0.1.3
-torch
-torchdiffeq==0.2.3
-torchsde==0.2.6
-transformers==4.30.2
-httpx==0.24.1
-pillow-avif-plugin==1.4.3
+GitPython==3.1.43
+Pillow==10.3.0
+accelerate==0.29.3
+blendmodes==2024.1.1
+clean-fid==0.1.35
+diskcache==5.6.3
+einops==0.8.0
+facexlib==0.3.0
+fastapi==0.90.1
+gradio==3.41.2
+httpcore==1.0.5
+inflection==0.5.1
+jsonmerge==1.9.2
+kornia==0.7.2
+lark==1.1.9
+numpy==1.26.4
+omegaconf==2.3.0
+open-clip-torch==2.24.0
+piexif==1.1.3
+psutil==5.9.8
+pydantic==1.10.15
+pytorch-lightning==2.2.4
+resize-right==0.0.2
+safetensors==0.4.3
+scikit-image==0.23.2
+spandrel==0.2.2
+tomesd==0.1.3
+torch
+torchdiffeq==0.2.3
+torchsde==0.2.6
+transformers==4.34.1
+httpx==0.27.0
+pillow-avif-plugin==1.4.3

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==2.1.0 torchvision==0.16.0"
+export TORCH_COMMAND="pip install torch==2.3.0 torchvision==0.18.0"
 export PYTORCH_ENABLE_MPS_FALLBACK=1
 
 ####################################################################