Update setup-cuda.sh

Dockerfile

@@ -20,7 +20,7 @@ ENV PATH="$HOME/miniconda/bin:$PATH"
 RUN conda init
 RUN conda install python=$PYTHON_VERSION
 RUN python3 -m pip install --upgrade pip
-RUN pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
+RUN pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu118
 
 RUN mkdir $HOME/ai-voice-cloning
 WORKDIR $HOME/ai-voice-cloning

README.md

@@ -1,6 +1,6 @@
 # AI Voice Cloning
 
-> **Note** This project is effectively abandonware due to requiring a rewrite. Please use [JarodMica/ai-voice-cloning](https://github.com/JarodMica/ai-voice-cloning).
+> **Note** This project has been in dire need of being rewritten from the ground up for some time. Apologies for any crust from my rather spaghetti code.
 
 This [repo](https://git.ecker.tech/mrq/ai-voice-cloning)/[rentry](https://rentry.org/AI-Voice-Cloning/) aims to serve as both a foolproof guide for setting up AI voice cloning tools for legitimate, local use on Windows/Linux, as well as a stepping stone for anons that genuinely want to play around with [TorToiSe](https://github.com/neonbjb/tortoise-tts).
 
@@ -16,4 +16,4 @@ Please consult [the wiki](https://git.ecker.tech/mrq/ai-voice-cloning/wiki) for
 
 ## Bug Reporting
 
-If you run into any problems, please refer to the [issues you may encounter](https://git.ecker.tech/mrq/ai-voice-cloning/wiki/Issues) wiki page first.
+If you run into any problems, please refer to the [issues you may encounter](https://git.ecker.tech/mrq/ai-voice-cloning/wiki/Issues) wiki page first.

notebook_colab.ipynb

@@ -38,24 +38,10 @@
             
          ],
          "source":[
-            "!apt install python3.10-venv\n",
+            "!apt install python3.8-venv\n",
             "!git clone https://git.ecker.tech/mrq/ai-voice-cloning/\n",
             "%cd /content/ai-voice-cloning\n",
-            "# get local dependencies\n",
+            "!./setup-cuda.sh"
-            "!git submodule init\n",
-            "!git submodule update --remote\n",
-            "# setup venv\n",
-            "!python3 -m venv venv\n",
-            "!source ./venv/bin/activate\n",
-            "!python3 -m pip install --upgrade pip # just to be safe\n",
-            "# CUDA\n",
-            "!pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118\n",
-            "# install requirements\n",
-            "!python3 -m pip install -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements\n",
-            "!python3 -m pip install -e ./modules/tortoise-tts/ # install TorToiSe\n",
-            "!python3 -m pip install -r ./modules/dlas/requirements.txt # instal DLAS requirements, last, because whisperx will break a dependency here\n",
-            "!python3 -m pip install -e ./modules/dlas/ # install DLAS\n",
-            "!python3 -m pip install -r ./requirements.txt # install local requirements"
          ]
       },
       {
@@ -129,8 +115,7 @@
          "cell_type":"code",
          "source":[
             "%cd /content/ai-voice-cloning/\n",
-            "!source ./venv/bin/activate\n",
+            "!./start.sh --share"
-            "!python3 ./src/main.py --share"
          ],
          "metadata":{
             "id":"QRA8jF3cF-YJ"

requirements.txt

@@ -1,9 +1,5 @@
---extra-index-url https://download.pytorch.org/whl/cu118
+git+https://github.com/openai/whisper.git
-torch>=2.1.0
-torchvision
-torchaudio
 
-openai-whisper
 more-itertools
 ffmpeg-python
 gradio<=3.23.0
@@ -13,5 +9,4 @@ psutil
 phonemizer
 pydantic==1.10.11
 websockets
-beartype==0.15.0
+beartype==0.15.0
-pykakasi

setup-cuda.bat

@@ -4,7 +4,7 @@ git submodule update --remote
 python -m venv venv
 call .\venv\Scripts\activate.bat
 python -m pip install --upgrade pip
-python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
+python -m pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu118
 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

setup-cuda.sh

@@ -7,7 +7,7 @@ python3 -m venv venv
 source ./venv/bin/activate
 python3 -m pip install --upgrade pip # just to be safe
 # CUDA
-pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu118
+pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu122
 # install requirements
 python3 -m pip install -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements
 python3 -m pip install -e ./modules/tortoise-tts/ # install TorToiSe

setup-rocm.sh

@@ -7,7 +7,7 @@ python3 -m venv venv
 source ./venv/bin/activate
 python3 -m pip install --upgrade pip # just to be safe
 # ROCM
-pip3 install torch==1.13.1 torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm5.2 # 5.4.2 doesn't work for me desu
+pip3 install torch==1.13.1 torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/rocm5.2 # 5.4.2 doesn't work for me desu
 # install requirements
 python3 -m pip install -r ./modules/tortoise-tts/requirements.txt # install TorToiSe requirements
 python3 -m pip install -e ./modules/tortoise-tts/ # install TorToiSe

src/utils.py

@@ -68,20 +68,8 @@ BARK_ENABLED = False
 
 VERBOSE_DEBUG = True
 
-KKS = None
-PYKAKASI_ENABLED = False
-
 import traceback
 
-try:
-	import pykakasi
-	KKS = pykakasi.kakasi()
-	PYKAKASI_ENABLED = True
-except Exception as e:
-	#if VERBOSE_DEBUG:
-	#	print(traceback.format_exc())
-	pass
-
 try:
 	from whisper.normalizers.english import EnglishTextNormalizer
 	from whisper.normalizers.basic import BasicTextNormalizer
@@ -2746,14 +2734,6 @@ def prepare_dataset( voice, use_segments=False, text_length=0, audio_length=0, p
 		phn_file = jobs['phonemize'][0][i]
 		normalized = jobs['phonemize'][1][i]
 
-		if language == "japanese":
-			language = "ja"
-
-		if language == "ja" and PYKAKASI_ENABLED and KKS is not None:
-			normalized = KKS.convert(normalized)
-			normalized = [ n["hira"] for n in normalized ]
-			normalized = "".join(normalized)
-
 		try:
 			phonemized = valle_phonemize( normalized )
 			open(phn_file, 'w', encoding='utf-8').write(" ".join(phonemized))