From 76fce284e4b189a0ce28af5317a2cc384e06d881 Mon Sep 17 00:00:00 2001 From: mrq Date: Thu, 16 Feb 2023 19:48:06 +0000 Subject: [PATCH] pip-ifying things --- requirements.txt | 6 +----- requirements_legacy.txt | 4 ++++ setup-cuda.bat | 1 + setup-cuda.sh | 1 + setup-directml.bat | 3 ++- setup-rocm.sh | 1 + setup.py | 4 ++-- 7 files changed, 12 insertions(+), 8 deletions(-) create mode 100755 requirements_legacy.txt mode change 100644 => 100755 setup.py diff --git a/requirements.txt b/requirements.txt index 56b5906..66270da 100755 --- a/requirements.txt +++ b/requirements.txt @@ -12,8 +12,4 @@ torchaudio threadpoolctl appdirs numpy -numba -gradio -music-tag -k-diffusion -voicefixer \ No newline at end of file +numba \ No newline at end of file diff --git a/requirements_legacy.txt b/requirements_legacy.txt new file mode 100755 index 0000000..7afcaec --- /dev/null +++ b/requirements_legacy.txt @@ -0,0 +1,4 @@ +gradio +music-tag +k-diffusion +voicefixer \ No newline at end of file diff --git a/setup-cuda.bat b/setup-cuda.bat index 9d7c70e..e32dc50 100755 --- a/setup-cuda.bat +++ b/setup-cuda.bat @@ -3,5 +3,6 @@ call .\tortoise-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/cu116 python -m pip install -r ./requirements.txt +python -m pip install -r ./requirements_legacy.txt deactivate pause \ No newline at end of file diff --git a/setup-cuda.sh b/setup-cuda.sh index d35bfd1..11d1943 100755 --- a/setup-cuda.sh +++ b/setup-cuda.sh @@ -4,4 +4,5 @@ python -m pip install --upgrade pip # CUDA pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 python -m pip install -r ./requirements.txt +python -m pip install -r ./requirements_legacy.txt deactivate diff --git a/setup-directml.bat b/setup-directml.bat index 8868267..c4608d2 100755 --- a/setup-directml.bat +++ b/setup-directml.bat @@ -1,7 +1,8 @@ python -m venv tortoise-venv call .\tortoise-venv\Scripts\activate.bat python -m pip install --upgrade pip -python -m pip install torch torchvision torchaudio torch-directml==0.1.13.1.dev230119 +python -m pip install torch torchvision torchaudio torch-directml python -m pip install -r ./requirements.txt +python -m pip install -r ./requirements_legacy.txt deactivate pause \ No newline at end of file diff --git a/setup-rocm.sh b/setup-rocm.sh index a528c05..8e7a59c 100755 --- a/setup-rocm.sh +++ b/setup-rocm.sh @@ -4,4 +4,5 @@ python -m pip install --upgrade pip # ROCM pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.1.1 # 5.2 does not work for me desu python -m pip install -r ./requirements.txt +python -m pip install -r ./requirements_legacy.txt deactivate diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 99bae37..528beff --- a/setup.py +++ b/setup.py @@ -6,13 +6,13 @@ with open("README.md", "r", encoding="utf-8") as fh: setuptools.setup( name="TorToiSe", packages=setuptools.find_packages(), - version="2.4.2", + version="2.4.3", author="James Betker", author_email="james@adamant.ai", description="A high quality multi-voice text-to-speech library", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/neonbjb/tortoise-tts", + url="https://git.ecker.tech/mrq/tortoise-tts", project_urls={}, scripts=[ 'scripts/tortoise_tts.py',