diff --git a/.compute b/.compute index 6cbb79f2..ff6a8360 100644 --- a/.compute +++ b/.compute @@ -1,4 +1,3 @@ #!/bin/bash source ../tmp/venv/bin/activate -export PYTHONPATH=' python train.py --config_path config.json \ No newline at end of file diff --git a/.install b/.install index e977c98b..acc7b6cc 100644 --- a/.install +++ b/.install @@ -1,4 +1,4 @@ #!/bin/bash virtualenv -p python3 ../tmp/venv source ../tmp/venv/bin/activate -pip install --no-cache-dir -r requirements.txt +python setup.py develop diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/datasets/LJSpeech.py b/datasets/LJSpeech.py index 03ccee28..7638e708 100644 --- a/datasets/LJSpeech.py +++ b/datasets/LJSpeech.py @@ -5,9 +5,9 @@ import librosa import torch from torch.utils.data import Dataset -from TTS.utils.text import text_to_sequence -from TTS.utils.audio import AudioProcessor -from TTS.utils.data import (prepare_data, pad_per_step, +from utils.text import text_to_sequence +from utils.audio import AudioProcessor +from utils.data import (prepare_data, pad_per_step, prepare_tensor, prepare_stop_target) diff --git a/models/tacotron.py b/models/tacotron.py index 71253149..1b0923a4 100644 --- a/models/tacotron.py +++ b/models/tacotron.py @@ -1,8 +1,8 @@ # coding: utf-8 import torch from torch import nn -from TTS.utils.text.symbols import symbols -from TTS.layers.tacotron import Prenet, Encoder, Decoder, CBHG +from utils.text.symbols import symbols +from layers.tacotron import Prenet, Encoder, Decoder, CBHG class Tacotron(nn.Module): diff --git a/setup.py b/setup.py index c3c4c001..06afe37a 100644 --- a/setup.py +++ b/setup.py @@ -71,6 +71,7 @@ setup(name='TTS', install_requires=[ "numpy", "scipy", + "librosa", "torch >= 0.4.0", "unidecode", "tensorboardX", diff --git a/utils/text/__init__.py b/utils/text/__init__.py index 9b812c27..3d158c99 100644 --- a/utils/text/__init__.py +++ b/utils/text/__init__.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- import re -from TTS.utils.text import cleaners -from TTS.utils.text.symbols import symbols +from utils.text import cleaners +from utils.text.symbols import symbols # Mappings from symbol to numeric ID and vice versa: diff --git a/utils/text/symbols.py b/utils/text/symbols.py index a1706b23..c8550e1d 100644 --- a/utils/text/symbols.py +++ b/utils/text/symbols.py @@ -7,7 +7,7 @@ Defines the set of symbols used in text input to the model. The default is a set of ASCII characters that works well for English or text that has been run through Unidecode. For other data, you can modify _characters. See TRAINING_DATA.md for details. ''' -from TTS.utils.text import cmudict +from utils.text import cmudict _pad = '_' _eos = '~'