From 99b6133bc98337f2f7a24a63cd616b2839308010 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Wed, 10 May 2023 16:40:36 -0400 Subject: [PATCH] update requirements --- installer.py | 8 ++++---- modules/shared.py | 2 +- requirements.txt | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/installer.py b/installer.py index 634ef3c1f..2ae7c36ee 100644 --- a/installer.py +++ b/installer.py @@ -197,12 +197,12 @@ def check_python(): def check_torch(): if shutil.which('nvidia-smi') is not None or os.path.exists(os.path.join(os.environ.get('SystemRoot') or r'C:\Windows', 'System32', 'nvidia-smi.exe')): log.info('nVidia CUDA toolkit detected') - torch_command = os.environ.get('TORCH_COMMAND', 'torch torchaudio torchvision --index-url https://download.pytorch.org/whl/cu118') + torch_command = os.environ.get('TORCH_COMMAND', 'torch torchaudio torchvision==0.15.1 --index-url https://download.pytorch.org/whl/cu118') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.17' if opts.get('cross_attention_optimization', '') == 'xFormers' else 'none') elif shutil.which('rocminfo') is not None or os.path.exists('/opt/rocm/bin/rocminfo'): log.info('AMD ROCm toolkit detected') os.environ.setdefault('HSA_OVERRIDE_GFX_VERSION', '10.3.0') - torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0 torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm5.4.2') + torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0 torchvision==0.15.1 torchaudio --index-url https://download.pytorch.org/whl/rocm5.4.2') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none') elif shutil.which('sycl-ls') is not None or os.path.exists('/opt/intel/oneapi') or args.use_ipex: log.info('Intel OneAPI Toolkit detected') @@ -212,11 +212,11 @@ def check_torch(): machine = platform.machine() if 'arm' not in machine and 'aarch' not in machine and args.use_directml: # torch-directml is available on AMD64 log.info('Using DirectML Backend') - torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0 torchvision torch-directml') + torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0 torchvision==0.15.1 torch-directml') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none') else: log.info('Using CPU-only Torch') - torch_command = os.environ.get('TORCH_COMMAND', 'torch==2.0.0 torchaudio torchvision') + torch_command = os.environ.get('TORCH_COMMAND', 'torch torchaudio torchvision==0.15.1') xformers_package = os.environ.get('XFORMERS_PACKAGE', 'none') if 'torch' in torch_command and not args.version: install(torch_command, 'torch torchvision torchaudio') diff --git a/modules/shared.py b/modules/shared.py index f82ace1c1..6e3f423ea 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -659,7 +659,7 @@ def reload_gradio_theme(theme_name=None): except: log.error("Theme download error accessing HuggingFace") gradio_theme = gr.themes.Default(**default_font_params) - log.info(f'Loading theme: {theme_name}') + log.info(f'Loading UI theme: {theme_name}') class TotalTQDM: diff --git a/requirements.txt b/requirements.txt index 5b4738e7a..672080854 100644 --- a/requirements.txt +++ b/requirements.txt @@ -51,7 +51,7 @@ accelerate==0.18.0 opencv-python==4.7.0.72 diffusers==0.16.1 einops==0.4.1 -gradio==3.28.1 +gradio==3.29.0 numexpr==2.8.4 pandas==1.5.3 protobuf==3.20.3 @@ -60,3 +60,4 @@ transformers==4.26.1 timm==0.6.13 tomesd==0.1.2 urllib3==1.26.15 +jaxlib==0.4.9