From c231d842aa45e94566aa053416ada81e0c39106b Mon Sep 17 00:00:00 2001 From: mrq <barry.quiggles@protonmail.com> Date: Fri, 10 Mar 2023 03:53:21 +0000 Subject: [PATCH] make dependencies after the one in this repo force reinstall to downgrade, i hope, I hav eother things to do than validate this works --- setup-cuda.bat | 6 +++--- setup-cuda.sh | 6 +++--- setup-directml.bat | 6 +++--- setup-rocm.sh | 6 +++--- update-force.bat | 6 +++--- update-force.sh | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/setup-cuda.bat b/setup-cuda.bat index 14b6d5f..d3563b4 100755 --- a/setup-cuda.bat +++ b/setup-cuda.bat @@ -6,9 +6,9 @@ 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 --force-reinstall -r .\modules\tortoise-tts\requirements.txt +python -m pip install --force-reinstall -e .\modules\tortoise-tts\ +python -m pip install --force-reinstall -r .\modules\dlas\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 c494375..3a26014 100755 --- a/setup-cuda.sh +++ b/setup-cuda.sh @@ -10,9 +10,9 @@ python3 -m pip install --upgrade pip # just to be safe 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 --force-reinstall -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements +python3 -m pip install --force-reinstall -e ./modules/tortoise-tts/ # install TorToiSe +python3 -m pip install --force-reinstall -r ./modules/dlas/requirements.txt # instal DLAS requirements, last, because whisperx will break a dependency here rm *.bat deactivate \ No newline at end of file diff --git a/setup-directml.bat b/setup-directml.bat index 35f8008..c085edf 100755 --- a/setup-directml.bat +++ b/setup-directml.bat @@ -6,9 +6,9 @@ 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 --force-reinstall -r .\modules\tortoise-tts\requirements.txt +python -m pip install --force-reinstall -e .\modules\tortoise-tts\ +python -m pip install --force-reinstall -r .\modules\dlas\requirements.txt del *.sh diff --git a/setup-rocm.sh b/setup-rocm.sh index 9e729d9..ff6c49a 100755 --- a/setup-rocm.sh +++ b/setup-rocm.sh @@ -10,9 +10,9 @@ python3 -m pip install --upgrade pip # just to be safe 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 +python3 -m pip install --force-reinstall -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements +python3 -m pip install --force-reinstall -e ./modules/tortoise-tts/ # install TorToiSe +python3 -m pip install --force-reinstall -r ./modules/dlas/requirements.txt # instal DLAS requirements rm *.bat ./setup-rocm-bnb.sh diff --git a/update-force.bat b/update-force.bat index fcbe106..07f1a74 100755 --- a/update-force.bat +++ b/update-force.bat @@ -7,9 +7,9 @@ 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 --force-reinstall -U -r .\modules\tortoise-tts\requirements.txt +python -m pip install --force-reinstall -U -e .\modules\tortoise-tts +python -m pip install --force-reinstall -U -r .\modules\dlas\requirements.txt pause deactivate \ No newline at end of file diff --git a/update-force.sh b/update-force.sh index 5e8c808..cf93e77 100755 --- a/update-force.sh +++ b/update-force.sh @@ -9,9 +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 -r ./requirements.txt +python3 -m pip install --force-reinstall -U -r ./modules/tortoise-tts/requirements.txt +python3 -m pip install --force-reinstall -U -e ./modules/tortoise-tts +python3 -m pip install --force-reinstall -U -r ./modules/dlas/requirements.txt deactivate \ No newline at end of file