From 109757d56d7a4c639e339e7682c6ebef638cd306 Mon Sep 17 00:00:00 2001 From: mrq Date: Sun, 19 Feb 2023 21:41:51 +0000 Subject: [PATCH] I forgot submodules existed --- .gitmodules | 6 ++++++ dlas | 1 + setup-cuda.bat | 10 +++++++--- setup-cuda.sh | 8 ++++++-- setup-directml.bat | 10 +++++++--- setup-rocm.sh | 8 ++++++-- setup-tortoise.bat | 3 --- setup-tortoise.sh | 4 ---- setup-training.bat | 2 -- setup-training.sh | 3 --- tortoise-tts | 1 + update.bat | 12 ++---------- update.sh | 12 ++---------- 13 files changed, 38 insertions(+), 42 deletions(-) create mode 100755 .gitmodules create mode 160000 dlas delete mode 100755 setup-tortoise.bat delete mode 100755 setup-tortoise.sh delete mode 100755 setup-training.bat delete mode 100755 setup-training.sh create mode 160000 tortoise-tts diff --git a/.gitmodules b/.gitmodules new file mode 100755 index 0000000..957430f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "tortoise-tts"] + path = tortoise-tts + url = https://git.ecker.tech/mrq/tortoise-tts +[submodule "dlas"] + path = dlas + url = https://git.ecker.tech/mrq/DL-Art-School diff --git a/dlas b/dlas new file mode 160000 index 0000000..6c284ef --- /dev/null +++ b/dlas @@ -0,0 +1 @@ +Subproject commit 6c284ef8ec4c4769de3181d90ac96ff63581ef55 diff --git a/setup-cuda.bat b/setup-cuda.bat index c387c24..53a29f3 100755 --- a/setup-cuda.bat +++ b/setup-cuda.bat @@ -1,9 +1,13 @@ +git submodule init +git submodule update + 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 -.\setup-tortoise.bat -.\setup-training.bat -python -m pip install -r ./requirements.txt +python -m pip install -r .\dlas\requirements.txt +python -m pip install -r .\tortoise-tts\requirements.txt +python -m pip install -r .\requirements.txt +python -m pip install -e .\tortoise-tts\ deactivate pause \ No newline at end of file diff --git a/setup-cuda.sh b/setup-cuda.sh index 3f5f6d3..f17706e 100755 --- a/setup-cuda.sh +++ b/setup-cuda.sh @@ -1,9 +1,13 @@ #!/bin/bash +git submodule init +git submodule update + 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 -./setup-tortoise.sh -./setup-training.sh +python -m pip install -r ./dlas/requirements.txt +python -m pip install -r ./tortoise-tts/requirements.txt python -m pip install -r ./requirements.txt +python -m pip install -e ./tortoise-tts/ deactivate diff --git a/setup-directml.bat b/setup-directml.bat index be05488..eff0949 100755 --- a/setup-directml.bat +++ b/setup-directml.bat @@ -1,9 +1,13 @@ +git submodule init +git submodule update + 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 -.\setup-tortoise.bat -.\setup-training.bat -python -m pip install -r ./requirements.txt +python -m pip install -r .\dlas\requirements.txt +python -m pip install -r .\tortoise-tts\requirements.txt +python -m pip install -r .\requirements.txt +python -m pip install -e .\tortoise-tts\ deactivate pause \ No newline at end of file diff --git a/setup-rocm.sh b/setup-rocm.sh index d0ae80d..9017346 100755 --- a/setup-rocm.sh +++ b/setup-rocm.sh @@ -1,10 +1,14 @@ #!/bin/bash +git submodule init +git submodule update + python -m venv venv 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 -./setup-training.sh -./setup-tortoise.sh +python -m pip install -r ./dlas/requirements.txt +python -m pip install -r ./tortoise-tts/requirements.txt python -m pip install -r ./requirements.txt +python -m pip install -e ./tortoise-tts/ deactivate diff --git a/setup-tortoise.bat b/setup-tortoise.bat deleted file mode 100755 index e8b81bc..0000000 --- a/setup-tortoise.bat +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100755 index 57c9dc9..0000000 --- a/setup-tortoise.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/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/setup-training.bat b/setup-training.bat deleted file mode 100755 index b8a5fa9..0000000 --- a/setup-training.bat +++ /dev/null @@ -1,2 +0,0 @@ -git clone https://git.ecker.tech/mrq/DL-Art-School dlas -python -m pip install -r .\dlas\requirements.txt \ No newline at end of file diff --git a/setup-training.sh b/setup-training.sh deleted file mode 100755 index 846cb2a..0000000 --- a/setup-training.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -git clone https://git.ecker.tech/mrq/DL-Art-School dlas -python -m pip install -r ./dlas/requirements.txt \ No newline at end of file diff --git a/tortoise-tts b/tortoise-tts new file mode 160000 index 0000000..17b375c --- /dev/null +++ b/tortoise-tts @@ -0,0 +1 @@ +Subproject commit 17b375c09d573315a0e5cda52a12e16ab5e48042 diff --git a/update.bat b/update.bat index 4c97ae3..2a3962a 100755 --- a/update.bat +++ b/update.bat @@ -1,17 +1,9 @@ git pull +git submodule update + python -m venv venv call .\venv\Scripts\activate.bat -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 diff --git a/update.sh b/update.sh index 4074cb6..fa6652b 100755 --- a/update.sh +++ b/update.sh @@ -1,18 +1,10 @@ #!/bin/bash git pull +git submodule update + python -m venv venv source ./venv/bin/activate -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