From ec550d74fd5a32ad1878528b9431ec5fde2b4c0a Mon Sep 17 00:00:00 2001 From: mrq Date: Sun, 19 Feb 2023 05:29:01 +0000 Subject: [PATCH] changed setup scripts to just clone mrq/tortoise-tts and install locally, instead of relying on pip's garbage git-integrations --- requirements.txt | 2 -- setup-cuda.bat | 3 +- setup-cuda.sh | 3 +- setup-directml.bat | 3 +- setup-rocm.sh | 3 +- setup-tortoise.bat | 3 ++ setup-tortoise.sh | 4 +++ train.ipynb | 69 ---------------------------------------------- update.bat | 15 ++++++++-- update.sh | 16 +++++++++-- 10 files changed, 40 insertions(+), 81 deletions(-) create mode 100755 setup-tortoise.bat create mode 100755 setup-tortoise.sh delete mode 100755 train.ipynb diff --git a/requirements.txt b/requirements.txt index 19f11e0..b590313 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ -git+https://git.ecker.tech/mrq/tortoise-tts.git -# git+https://git.ecker.tech/mrq/DL-Art-School.git git+https://github.com/openai/whisper.git more-itertools ffmpeg-python diff --git a/setup-cuda.bat b/setup-cuda.bat index 9453d3e..c387c24 100755 --- a/setup-cuda.bat +++ b/setup-cuda.bat @@ -2,7 +2,8 @@ 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/cu116 -python -m pip install -r ./requirements.txt +.\setup-tortoise.bat .\setup-training.bat +python -m pip install -r ./requirements.txt deactivate pause \ No newline at end of file diff --git a/setup-cuda.sh b/setup-cuda.sh index 2833293..3f5f6d3 100755 --- a/setup-cuda.sh +++ b/setup-cuda.sh @@ -3,6 +3,7 @@ python -m venv venv source ./venv/bin/activate python -m pip install --upgrade pip pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu116 -python -m pip install -r ./requirements.txt +./setup-tortoise.sh ./setup-training.sh +python -m pip install -r ./requirements.txt deactivate diff --git a/setup-directml.bat b/setup-directml.bat index 6b5bc98..be05488 100755 --- a/setup-directml.bat +++ b/setup-directml.bat @@ -2,7 +2,8 @@ python -m venv venv call .\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 -r ./requirements.txt +.\setup-tortoise.bat .\setup-training.bat +python -m pip install -r ./requirements.txt deactivate pause \ No newline at end of file diff --git a/setup-rocm.sh b/setup-rocm.sh index 4a78c25..d0ae80d 100755 --- a/setup-rocm.sh +++ b/setup-rocm.sh @@ -4,6 +4,7 @@ source ./venv/bin/activate 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 ./setup-training.sh +./setup-tortoise.sh +python -m pip install -r ./requirements.txt deactivate diff --git a/setup-tortoise.bat b/setup-tortoise.bat new file mode 100755 index 0000000..e8b81bc --- /dev/null +++ b/setup-tortoise.bat @@ -0,0 +1,3 @@ +git clone https://git.ecker.tech/mrq/tortoise-tts +python -m pip install -r .\tortoise-tts\requirements.txt +python -m pip install -e .\tortoise-tts\ \ No newline at end of file diff --git a/setup-tortoise.sh b/setup-tortoise.sh new file mode 100755 index 0000000..57c9dc9 --- /dev/null +++ b/setup-tortoise.sh @@ -0,0 +1,4 @@ +#!/bin/bash +git clone https://git.ecker.tech/mrq/tortoise-tts +python -m pip install -r ./tortoise-tts/requirements.txt +python -m pip install -e ./tortoise-tts/ \ No newline at end of file diff --git a/train.ipynb b/train.ipynb deleted file mode 100755 index 12320ec..0000000 --- a/train.ipynb +++ /dev/null @@ -1,69 +0,0 @@ -{ - "nbformat":4, - "nbformat_minor":0, - "metadata":{ - "colab":{ - "private_outputs":true, - "provenance":[ - - ] - }, - "kernelspec":{ - "name":"python3", - "display_name":"Python 3" - }, - "language_info":{ - "name":"python" - }, - "accelerator":"GPU", - "gpuClass":"standard" - }, - "cells":[ - { - "cell_type":"code", - "execution_count":null, - "metadata":{ - "id":"AaKpV3rCI3Eo" - }, - "outputs":[ - - ], - "source":[ - "!git clone https://git.ecker.tech/mrq/DL-Art-School\n", - "%cd DL-Art-School\n", - "!rm -r experiments\n", - "!pip install -r requirements.txt" - ] - }, - { - "cell_type":"code", - "source":[ - "from google.colab import drive\n", - "drive.mount('/content/drive')", - "%cd /content/DL-Art-School/\n", - "!ln -s /content/drive/MyDrive/experiments/\n", - ], - "metadata":{ - "id":"8eV92cjGI4XL" - }, - "execution_count":null, - "outputs":[ - - ] - }, - { - "cell_type":"code", - "source":[ - "%cd /content/DL-Art-School/\n", - "!python ./codes/train.py -opt ./experiments/ar.yml" - ], - "metadata":{ - "id":"7lcRGqglX2FC" - }, - "execution_count":null, - "outputs":[ - - ] - } - ] -} \ No newline at end of file diff --git a/update.bat b/update.bat index 1b732ba..4c97ae3 100755 --- a/update.bat +++ b/update.bat @@ -1,13 +1,22 @@ git pull python -m venv venv call .\venv\Scripts\activate.bat -python -m pip install --upgrade pip -python -m pip install -r ./requirements.txt -python -m pip install -r ./dlas/requirements.txt +git clone https://git.ecker.tech/mrq/DL-Art-School dlas cd dlas git pull cd .. +git clone https://git.ecker.tech/mrq/tortoise-tts +cd tortoise-tts +git pull +cd .. + +python -m pip install --upgrade pip +python -m pip install -r .\dlas\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 + deactivate pause \ No newline at end of file diff --git a/update.sh b/update.sh index b38d76a..4074cb6 100755 --- a/update.sh +++ b/update.sh @@ -2,12 +2,22 @@ git pull python -m venv venv source ./venv/bin/activate -python -m pip install --upgrade pip -python -m pip install -r ./requirements.txt -python -m pip install -r ./dlas/requirements.txt +git clone https://git.ecker.tech/mrq/DL-Art-School dlas cd dlas git pull cd .. +git clone https://git.ecker.tech/mrq/tortoise-tts +cd tortoise-tts +git pull +cd .. + +python -m pip install --upgrade pip +python -m pip install -r ./dlas/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 + + deactivate \ No newline at end of file