From 11a1f6a00ea3a2408d7592537a748433ad3b5496 Mon Sep 17 00:00:00 2001 From: mrq Date: Mon, 6 Mar 2023 16:43:17 +0000 Subject: [PATCH] forgot to reorder the dependency install because whisperx needs to be installed before DLAS --- setup-cuda.bat | 4 ++-- setup-cuda.sh | 4 ++-- setup-directml.bat | 4 ++-- setup-rocm.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup-cuda.bat b/setup-cuda.bat index f071d2b..efd7262 100755 --- a/setup-cuda.bat +++ b/setup-cuda.bat @@ -5,10 +5,10 @@ python -m venv venv call .\venv\Scripts\activate.bat python -m pip install --upgrade pip python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 -python -m pip install -r .\dlas\requirements.txt +python -m pip install -r .\requirements.txt python -m pip install -r .\tortoise-tts\requirements.txt python -m pip install -e .\tortoise-tts\ -python -m pip install -r .\requirements.txt +python -m pip install -r .\dlas\requirements.txt xcopy .\dlas\bitsandbytes_windows\* .\venv\Lib\site-packages\bitsandbytes\. /Y xcopy .\dlas\bitsandbytes_windows\cuda_setup\* .\venv\Lib\site-packages\bitsandbytes\cuda_setup\. /Y diff --git a/setup-cuda.sh b/setup-cuda.sh index fd47ce7..bd0628e 100755 --- a/setup-cuda.sh +++ b/setup-cuda.sh @@ -9,9 +9,9 @@ python3 -m pip install --upgrade pip # just to be safe # CUDA pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 # install requirements -python3 -m pip install -r ./dlas/requirements.txt # instal DLAS requirements +python3 -m pip install -r ./requirements.txt # install local requirements python3 -m pip install -r ./tortoise-tts/requirements.txt # install TorToiSe requirements python3 -m pip install -e ./tortoise-tts/ # install TorToiSe -python3 -m pip install -r ./requirements.txt # install local requirements +python3 -m pip install -r ./dlas/requirements.txt # instal DLAS requirements, last, because whisperx will break a dependency here deactivate \ No newline at end of file diff --git a/setup-directml.bat b/setup-directml.bat index 1ec13ea..9a11229 100755 --- a/setup-directml.bat +++ b/setup-directml.bat @@ -5,10 +5,10 @@ python -m venv venv call .\venv\Scripts\activate.bat python -m pip install --upgrade pip python -m pip install torch torchvision torchaudio torch-directml -python -m pip install -r .\dlas\requirements.txt +python -m pip install -r .\requirements.txt python -m pip install -r .\tortoise-tts\requirements.txt python -m pip install -e .\tortoise-tts\ -python -m pip install -r .\requirements.txt +python -m pip install -r .\dlas\requirements.txt pause deactivate \ No newline at end of file diff --git a/setup-rocm.sh b/setup-rocm.sh index adf4b0f..c5d67b8 100755 --- a/setup-rocm.sh +++ b/setup-rocm.sh @@ -9,10 +9,10 @@ python3 -m pip install --upgrade pip # just to be safe # ROCM pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 # 5.2 does not work for me desu # install requirements -python3 -m pip install -r ./dlas/requirements.txt # instal DLAS requirements +python3 -m pip install -r ./requirements.txt # install local requirements python3 -m pip install -r ./tortoise-tts/requirements.txt # install TorToiSe requirements python3 -m pip install -e ./tortoise-tts/ # install TorToiSe -python3 -m pip install -r ./requirements.txt # install local requirements +python3 -m pip install -r ./dlas/requirements.txt # instal DLAS requirements # swap to ROCm version of BitsAndBytes pip3 uninstall -y bitsandbytes ./setup-rocm-bnb.sh