From e680d84a134f6cb65d999a914c9c3fe0404fe7a5 Mon Sep 17 00:00:00 2001 From: mrq Date: Sat, 11 Mar 2023 16:55:19 +0000 Subject: [PATCH] removed the hotfix pip installs that whisperx requires now that whisperx is gone --- setup-cuda.bat | 5 +---- setup-cuda.sh | 5 +---- setup-directml.bat | 5 +---- setup-rocm.sh | 5 +---- update-force.bat | 4 +--- update-force.sh | 4 +--- 6 files changed, 6 insertions(+), 22 deletions(-) diff --git a/setup-cuda.bat b/setup-cuda.bat index 496929a..405a9b6 100755 --- a/setup-cuda.bat +++ b/setup-cuda.bat @@ -5,13 +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 .\requirements.txt python -m pip install -r .\modules\tortoise-tts\requirements.txt python -m pip install -e .\modules\tortoise-tts\ python -m pip install -r .\modules\dlas\requirements.txt - -python -m pip install -U einops==0.6.0 -python -m pip install -U librosa==0.8.1 +python -m pip install -r .\requirements.txt xcopy .\modules\dlas\bitsandbytes_windows\* .\venv\Lib\site-packages\bitsandbytes\. /Y xcopy .\modules\dlas\bitsandbytes_windows\cuda_setup\* .\venv\Lib\site-packages\bitsandbytes\cuda_setup\. /Y diff --git a/setup-cuda.sh b/setup-cuda.sh index 69f0426..81d6a9f 100755 --- a/setup-cuda.sh +++ b/setup-cuda.sh @@ -9,13 +9,10 @@ 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 ./requirements.txt # install local requirements python3 -m pip install -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements python3 -m pip install -e ./modules/tortoise-tts/ # install TorToiSe python3 -m pip install -r ./modules/dlas/requirements.txt # instal DLAS requirements, last, because whisperx will break a dependency here - -python3 -m pip install -U einops==0.6.0 -python3 -m pip install -U librosa==0.8.1 +python3 -m pip install -r ./requirements.txt # install local requirements rm *.bat diff --git a/setup-directml.bat b/setup-directml.bat index 536945c..929fb5a 100755 --- a/setup-directml.bat +++ b/setup-directml.bat @@ -5,13 +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 .\requirements.txt python -m pip install -r .\modules\tortoise-tts\requirements.txt python -m pip install -e .\modules\tortoise-tts\ python -m pip install -r .\modules\dlas\requirements.txt - -python -m pip install -U einops==0.6.0 -python -m pip install -U librosa==0.8.1 +python -m pip install -r .\requirements.txt del *.sh diff --git a/setup-rocm.sh b/setup-rocm.sh index 5e48bf1..734d9ca 100755 --- a/setup-rocm.sh +++ b/setup-rocm.sh @@ -9,13 +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 ./requirements.txt # install local requirements python3 -m pip install -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements python3 -m pip install -e ./modules/tortoise-tts/ # install TorToiSe python3 -m pip install -r ./modules/dlas/requirements.txt # instal DLAS requirements - -python -m pip install -U einops==0.6.0 -python -m pip install -U librosa==0.8.1 +python3 -m pip install -r ./requirements.txt # install local requirements rm *.bat diff --git a/update-force.bat b/update-force.bat index 4a7b15e..84b3647 100755 --- a/update-force.bat +++ b/update-force.bat @@ -6,12 +6,10 @@ python -m venv venv call .\venv\Scripts\activate.bat python -m pip install --upgrade pip -python -m pip install -U -r .\requirements.txt python -m pip install -U -r .\modules\tortoise-tts\requirements.txt python -m pip install -U -e .\modules\tortoise-tts python -m pip install -U -r .\modules\dlas\requirements.txt -python -m pip install -U einops==0.6.0 -python -m pip install -U librosa==0.8.1 +python -m pip install -U -r .\requirements.txt pause deactivate \ No newline at end of file diff --git a/update-force.sh b/update-force.sh index 8fb44b1..4832988 100755 --- a/update-force.sh +++ b/update-force.sh @@ -9,11 +9,9 @@ python3 -m venv venv source ./venv/bin/activate python3 -m pip install --upgrade pip -python3 -m pip install -r ./requirements.txt python3 -m pip install -r ./modules/tortoise-tts/requirements.txt python3 -m pip install -e ./modules/tortoise-tts python3 -m pip install -r ./modules/dlas/requirements.txt -python3 -m pip install -U einops==0.6.0 -python3 -m pip install -U librosa==0.8.1 +python3 -m pip install -r ./requirements.txt deactivate \ No newline at end of file