From c828ff78f394dabca5a006ed0a591c4656056366 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:02:37 +0100 Subject: [PATCH 01/11] Update requirements.txt Original `requirements.txt` didn't work for me. --- requirements.txt | 78 +++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 44 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4795b73..a47d978 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,44 +1,34 @@ -accelerate==0.24.1 -certifi==2023.11.17 -charset-normalizer==3.3.2 -diffusers==0.19.3 -filelock==3.13.1 -fsspec==2023.10.0 -huggingface-hub==0.19.4 -idna==3.4 -importlib-metadata==6.8.0 -Jinja2==3.1.2 -MarkupSafe==2.1.3 -mpmath==1.3.0 -networkx==3.2.1 -numpy==1.26.2 -nvidia-cublas-cu12==12.1.3.1 -nvidia-cuda-cupti-cu12==12.1.105 -nvidia-cuda-nvrtc-cu12==12.1.105 -nvidia-cuda-runtime-cu12==12.1.105 -nvidia-cudnn-cu12==8.9.2.26 -nvidia-cufft-cu12==11.0.2.54 -nvidia-curand-cu12==10.3.2.106 -nvidia-cusolver-cu12==11.4.5.107 -nvidia-cusparse-cu12==12.1.0.106 -nvidia-nccl-cu12==2.18.1 -nvidia-nvjitlink-cu12==12.3.101 -nvidia-nvtx-cu12==12.1.105 -packaging==23.2 -Pillow==10.1.0 -psutil==5.9.6 -PyYAML==6.0.1 -regex==2023.10.3 -requests==2.31.0 -safetensors==0.4.0 -sentencepiece==0.1.99 -sympy==1.12 -tokenizers==0.15.0 -torch==2.1.1 -torchvision==0.16.1 -tqdm==4.66.1 -transformers==4.35.2 -triton==2.1.0 -typing_extensions==4.8.0 -urllib3==2.1.0 -zipp==3.17.0 +accelerate 0.27.2 +certifi 2024.2.2 +charset-normalizer 3.3.2 +colorama 0.4.6 +diffusers 0.19.3 +filelock 3.13.1 +fsspec 2024.2.0 +huggingface-hub 0.20.3 +idna 3.6 +importlib-metadata 7.0.1 +Jinja2 3.1.2 +MarkupSafe 2.1.3 +mpmath 1.3.0 +networkx 3.2.1 +numpy 1.26.4 +packaging 23.2 +pillow 10.2.0 +pip 24.0 +psutil 5.9.8 +PyYAML 6.0.1 +regex 2023.12.25 +requests 2.31.0 +safetensors 0.4.2 +setuptools 65.5.0 +sympy 1.12 +tokenizers 0.15.2 +torch 2.2.0+cu121 +torchaudio 2.2.0+cu121 +torchvision 0.17.0+cu121 +tqdm 4.66.2 +transformers 4.35.2 +typing_extensions 4.9.0 +urllib3 2.2.1 +zipp 3.17.0 From ad1afcc2eb74f4446eb25517c8b5be3ec62dbbee Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:14:41 +0100 Subject: [PATCH 02/11] Update requirements.txt --- requirements.txt | 68 ++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/requirements.txt b/requirements.txt index a47d978..f780ad3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,34 @@ -accelerate 0.27.2 -certifi 2024.2.2 -charset-normalizer 3.3.2 -colorama 0.4.6 -diffusers 0.19.3 -filelock 3.13.1 -fsspec 2024.2.0 -huggingface-hub 0.20.3 -idna 3.6 -importlib-metadata 7.0.1 -Jinja2 3.1.2 -MarkupSafe 2.1.3 -mpmath 1.3.0 -networkx 3.2.1 -numpy 1.26.4 -packaging 23.2 -pillow 10.2.0 -pip 24.0 -psutil 5.9.8 -PyYAML 6.0.1 -regex 2023.12.25 -requests 2.31.0 -safetensors 0.4.2 -setuptools 65.5.0 -sympy 1.12 -tokenizers 0.15.2 -torch 2.2.0+cu121 -torchaudio 2.2.0+cu121 -torchvision 0.17.0+cu121 -tqdm 4.66.2 -transformers 4.35.2 -typing_extensions 4.9.0 -urllib3 2.2.1 -zipp 3.17.0 +accelerate==0.27.2 +certif==2024.2.2 +charset-normalizer==3.3.2 +colorama==0.4.6 +diffusers==0.19.3 +filelock==3.13.1 +fsspec==2024.2.0 +huggingface-hub==0.20.3 +idna==3.6 +importlib-metadata==7.0.1 +Jinja2==3.1.2 +MarkupSafe==2.1.3 +mpmath==1.3.0 +networkx==3.2.1 +numpy==1.26.4 +packaging==23.2 +pillow==10.2.0 +pip==24.0 +psutil==5.9.8 +PyYAML==6.0.1 +regex==2023.12.25 +requests==2.31.0 +safetensors==0.4.2 +setuptools==65.5.0 +sympy==1.12 +tokenizers==0.15.2 +torch==2.2.0+cu121 +torchaudio==2.2.0+cu121 +torchvision==0.17.0+cu121 +tqdm==4.66.2 +transformers==4.35.2 +typing_extensions==4.9.0 +urllib3==2.2.1 +zipp==3.17.0 From 98217015e7aa5eeb4cb5794aef42c7e0f04cc2c8 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:28:34 +0100 Subject: [PATCH 03/11] Update requirements.txt --- requirements.txt | 37 ++++--------------------------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/requirements.txt b/requirements.txt index f780ad3..1a83bcb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,34 +1,5 @@ -accelerate==0.27.2 -certif==2024.2.2 -charset-normalizer==3.3.2 -colorama==0.4.6 diffusers==0.19.3 -filelock==3.13.1 -fsspec==2024.2.0 -huggingface-hub==0.20.3 -idna==3.6 -importlib-metadata==7.0.1 -Jinja2==3.1.2 -MarkupSafe==2.1.3 -mpmath==1.3.0 -networkx==3.2.1 -numpy==1.26.4 -packaging==23.2 -pillow==10.2.0 -pip==24.0 -psutil==5.9.8 -PyYAML==6.0.1 -regex==2023.12.25 -requests==2.31.0 -safetensors==0.4.2 -setuptools==65.5.0 -sympy==1.12 -tokenizers==0.15.2 -torch==2.2.0+cu121 -torchaudio==2.2.0+cu121 -torchvision==0.17.0+cu121 -tqdm==4.66.2 -transformers==4.35.2 -typing_extensions==4.9.0 -urllib3==2.2.1 -zipp==3.17.0 +transformers>=4.35.2 +torch>=2.1.2+cu118 +torchvision>=0.16.2+cu118 +accelerate>=0.27.2 From 3f916d7a1b2c35ea46eb2f595e333be51f733419 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:30:51 +0100 Subject: [PATCH 04/11] Create install.bat --- install.bat | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 install.bat diff --git a/install.bat b/install.bat new file mode 100644 index 0000000..d65b963 --- /dev/null +++ b/install.bat @@ -0,0 +1,24 @@ +@echo off +REM Check for Python and exit if not found +python --version >nul 2>&1 +if %errorlevel% neq 0 ( + echo Python is not installed. Please install Python and retry. + exit /b +) + +REM Create a virtual environment +python -m venv venv + +REM Activate the virtual environment +call venv\Scripts\activate.bat + +REM Upgrade pip before `pip install` +python -m pip install --upgrade pip + +pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 + +REM Install other requirements +pip install -r requirements_test.txt + +echo Installation completed. +pause From 955603551caa73ace4eedd6b1f7c895b086eb337 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:36:48 +0100 Subject: [PATCH 05/11] Update install.bat --- install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.bat b/install.bat index d65b963..3aaf00b 100644 --- a/install.bat +++ b/install.bat @@ -18,7 +18,7 @@ python -m pip install --upgrade pip pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 REM Install other requirements -pip install -r requirements_test.txt +pip install -r requirements.txt echo Installation completed. pause From 1d3a16223cf1f802507354cded91c4d8d35a0405 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:37:09 +0100 Subject: [PATCH 06/11] Create install.sh --- install.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 install.sh diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..b4c3e7a --- /dev/null +++ b/install.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e +cd "$(dirname "$0")" +# Check for Python and exit if not found +if ! [ -x "$(command -v python)" ]; then + echo 'Error: python is not installed.' >&2 + exit 1 +fi +# Create a virtual environment +if [ ! -d "venv" ]; then + python -m venv venv +fi + +# Upgrade pip before `pip install` +python -m pip install --upgrade pip + +# Install the custom diffusers version from GitHub +./venv/bin/pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 + +# Install other requirements +./venv/bin/pip install -r requirements.txt + +echo "Installation completed." From aaf4b0455af5ae64bb5cd3c714c82937b0ac9774 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:43:36 +0100 Subject: [PATCH 07/11] Update README.md Added necessary PyTorch install --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index eae2c25..c7ac853 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ - Install the required dependencies: ```bash + pip install pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 pip install -r requirements.txt ``` From 3e89b228385f892a26e17db28c8e4f0521b1708d Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:08:46 +0100 Subject: [PATCH 08/11] Update install.sh Deleted `torchaudio` --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index b4c3e7a..ca6f1b6 100644 --- a/install.sh +++ b/install.sh @@ -15,7 +15,7 @@ fi python -m pip install --upgrade pip # Install the custom diffusers version from GitHub -./venv/bin/pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 +./venv/bin/pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu118 # Install other requirements ./venv/bin/pip install -r requirements.txt From 57873be4c79fcf7b9507d4f68079824f3870e9ed Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Mon, 26 Feb 2024 11:09:12 +0100 Subject: [PATCH 09/11] Deleted `torchaudio` --- install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.bat b/install.bat index 3aaf00b..b03e892 100644 --- a/install.bat +++ b/install.bat @@ -15,7 +15,7 @@ call venv\Scripts\activate.bat REM Upgrade pip before `pip install` python -m pip install --upgrade pip -pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 +pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu118 REM Install other requirements pip install -r requirements.txt From b4c7d93e2c1a5e7398fa63ee4211bf88ccdeac59 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Mon, 26 Feb 2024 15:18:33 +0100 Subject: [PATCH 10/11] Update requirements.txt Add `sentencepiece`, which is required for DeepFloyd/IF --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 1a83bcb..9c9207b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ transformers>=4.35.2 torch>=2.1.2+cu118 torchvision>=0.16.2+cu118 accelerate>=0.27.2 +sentencepiece # Required for DeepFloyd/IF From 56de5b78f342951ba10a714f924866eaca64be04 Mon Sep 17 00:00:00 2001 From: EtienneDosSantos <130935112+EtienneDosSantos@users.noreply.github.com> Date: Mon, 26 Feb 2024 16:28:48 +0100 Subject: [PATCH 11/11] Update README.md Deleted `torchaudio` as it is not needed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7ac853..82ad3be 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ - Install the required dependencies: ```bash - pip install pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118 + pip install pip3 install torch torchvision --index-url https://download.pytorch.org/whl/cu118 pip install -r requirements.txt ```