DLAS is PIPified (but I'm still cloning it as a submodule to make updating it easier)

This commit is contained in:
mrq 2023-03-21 15:46:53 +00:00
parent 34ef0467b9
commit 0c2a9168f8
7 changed files with 9 additions and 8 deletions

View File

@ -8,6 +8,7 @@ python -m pip install torch torchvision torchaudio --extra-index-url https://dow
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 -e .\modules\dlas\
python -m pip install -r .\requirements.txt
# setup BnB

View File

@ -12,6 +12,7 @@ pip3 install torch torchvision torchaudio --extra-index-url https://download.pyt
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 -e ./modules/dlas/ # install DLAS
python3 -m pip install -r ./requirements.txt # install local requirements
rm *.bat

View File

@ -8,6 +8,7 @@ python -m pip install torch==1.13.1 torchvision torchaudio torch-directml
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 -e .\modules\dlas\
python -m pip install -r .\requirements.txt
del *.sh

View File

@ -12,6 +12,7 @@ pip3 install torch==1.13.1 torchvision torchaudio --extra-index-url https://down
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 -e ./modules/dlas/ # install DLAS
python3 -m pip install -r ./requirements.txt # install local requirements
rm *.bat

View File

@ -6,10 +6,6 @@ import datetime
from torch.distributed.run import main as torchrun
# it'd be downright sugoi if I was able to install DLAS as a pip package
sys.path.insert(0, './modules/dlas/codes/')
sys.path.insert(0, './modules/dlas/')
# this is effectively just copy pasted and cleaned up from the __main__ section of training.py
def train(config_path, launcher='none'):
opt = option.parse(config_path, is_train=True)
@ -62,7 +58,7 @@ if __name__ == "__main__":
pass
import torch
from codes import train as tr
from utils import util, options as option
from dlas import train as tr
from dlas.utils import util, options as option
train(config_path, args.launcher)

View File

@ -199,7 +199,7 @@ def prepare_dataset_proxy( voice, language, validation_text_length, validation_a
messages.append(message)
if slice_audio:
message = slice_dataset( voice, trim_silence=trim_silence, start_offset=slice_start_offset, end_offset=slice_end_offset, progress=progress )
message = slice_dataset( voice, trim_silence=trim_silence, start_offset=slice_start_offset, end_offset=slice_end_offset, results=None, progress=progress )
messages.append(message)
message = prepare_dataset( voice, use_segments=slice_audio, text_length=validation_text_length, audio_length=validation_audio_length, progress=progress )

View File

@ -10,8 +10,9 @@ source ./venv/bin/activate
python3 -m pip install --upgrade pip
python3 -m pip install -r ./modules/tortoise-tts/requirements.txt
python3 -m pip install -e ./modules/tortoise-tts
python3 -m pip install -e ./modules/tortoise-tts
python3 -m pip install -r ./modules/dlas/requirements.txt
python3 -m pip install -e ./modules/dlas
python3 -m pip install -r ./requirements.txt
deactivate