From d25f017b421b2f965c6e61c8c3023e387d6575a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Thu, 27 May 2021 10:47:24 +0200 Subject: [PATCH] update `setup_model.py` imports --- TTS/bin/compute_attention_masks.py | 2 +- TTS/bin/convert_tacotron2_torch_to_tf.py | 2 +- TTS/bin/extract_tts_spectrograms.py | 2 +- TTS/bin/train_align_tts.py | 2 +- TTS/bin/train_glow_tts.py | 2 +- TTS/bin/train_speedy_speech.py | 2 +- TTS/bin/train_tacotron.py | 2 +- TTS/utils/synthesizer.py | 2 +- tests/inference_tests/test_synthesizer.py | 2 +- tests/test_extract_tts_spectrograms.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/TTS/bin/compute_attention_masks.py b/TTS/bin/compute_attention_masks.py index e14ff433..3cbf40ba 100644 --- a/TTS/bin/compute_attention_masks.py +++ b/TTS/bin/compute_attention_masks.py @@ -9,7 +9,7 @@ from torch.utils.data import DataLoader from tqdm import tqdm from TTS.tts.datasets.TTSDataset import TTSDataset -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.io import load_checkpoint from TTS.tts.utils.text.symbols import make_symbols, phonemes, symbols from TTS.utils.audio import AudioProcessor diff --git a/TTS/bin/convert_tacotron2_torch_to_tf.py b/TTS/bin/convert_tacotron2_torch_to_tf.py index d523d01e..e7f991be 100644 --- a/TTS/bin/convert_tacotron2_torch_to_tf.py +++ b/TTS/bin/convert_tacotron2_torch_to_tf.py @@ -11,7 +11,7 @@ import torch from TTS.tts.tf.models.tacotron2 import Tacotron2 from TTS.tts.tf.utils.convert_torch_to_tf_utils import compare_torch_tf, convert_tf_name, transfer_weights_torch_to_tf from TTS.tts.tf.utils.generic_utils import save_checkpoint -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.text.symbols import phonemes, symbols from TTS.utils.io import load_config diff --git a/TTS/bin/extract_tts_spectrograms.py b/TTS/bin/extract_tts_spectrograms.py index da6de9c0..970600aa 100755 --- a/TTS/bin/extract_tts_spectrograms.py +++ b/TTS/bin/extract_tts_spectrograms.py @@ -12,7 +12,7 @@ from tqdm import tqdm from TTS.config import load_config from TTS.tts.datasets.preprocess import load_meta_data from TTS.tts.datasets.TTSDataset import TTSDataset -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.speakers import parse_speakers from TTS.tts.utils.text.symbols import make_symbols, phonemes, symbols from TTS.utils.audio import AudioProcessor diff --git a/TTS/bin/train_align_tts.py b/TTS/bin/train_align_tts.py index d231484a..b94d7a65 100644 --- a/TTS/bin/train_align_tts.py +++ b/TTS/bin/train_align_tts.py @@ -16,7 +16,7 @@ from torch.utils.data.distributed import DistributedSampler from TTS.tts.datasets.preprocess import load_meta_data from TTS.tts.datasets.TTSDataset import TTSDataset from TTS.tts.layers.losses import AlignTTSLoss -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.io import save_best_model, save_checkpoint from TTS.tts.utils.measures import alignment_diagonal_score from TTS.tts.utils.speakers import parse_speakers diff --git a/TTS/bin/train_glow_tts.py b/TTS/bin/train_glow_tts.py index 9a455a1b..9df185ee 100644 --- a/TTS/bin/train_glow_tts.py +++ b/TTS/bin/train_glow_tts.py @@ -17,7 +17,7 @@ from torch.utils.data.distributed import DistributedSampler from TTS.tts.datasets.preprocess import load_meta_data from TTS.tts.datasets.TTSDataset import TTSDataset from TTS.tts.layers.losses import GlowTTSLoss -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.io import save_best_model, save_checkpoint from TTS.tts.utils.measures import alignment_diagonal_score from TTS.tts.utils.speakers import parse_speakers diff --git a/TTS/bin/train_speedy_speech.py b/TTS/bin/train_speedy_speech.py index 742a27d8..57ff4272 100644 --- a/TTS/bin/train_speedy_speech.py +++ b/TTS/bin/train_speedy_speech.py @@ -18,7 +18,7 @@ from torch.utils.data.distributed import DistributedSampler from TTS.tts.datasets.preprocess import load_meta_data from TTS.tts.datasets.TTSDataset import TTSDataset from TTS.tts.layers.losses import SpeedySpeechLoss -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.io import save_best_model, save_checkpoint from TTS.tts.utils.measures import alignment_diagonal_score from TTS.tts.utils.speakers import parse_speakers diff --git a/TTS/bin/train_tacotron.py b/TTS/bin/train_tacotron.py index b5e38b80..f833ffc6 100755 --- a/TTS/bin/train_tacotron.py +++ b/TTS/bin/train_tacotron.py @@ -14,7 +14,7 @@ from torch.utils.data import DataLoader from TTS.tts.datasets.preprocess import load_meta_data from TTS.tts.datasets.TTSDataset import TTSDataset from TTS.tts.layers.losses import TacotronLoss -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.io import save_best_model, save_checkpoint from TTS.tts.utils.measures import alignment_diagonal_score from TTS.tts.utils.speakers import parse_speakers diff --git a/TTS/utils/synthesizer.py b/TTS/utils/synthesizer.py index 5962950f..8af95a12 100644 --- a/TTS/utils/synthesizer.py +++ b/TTS/utils/synthesizer.py @@ -6,7 +6,7 @@ import pysbd import torch from TTS.config import load_config -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.speakers import SpeakerManager # pylint: disable=unused-wildcard-import diff --git a/tests/inference_tests/test_synthesizer.py b/tests/inference_tests/test_synthesizer.py index a1cd4de5..b0fa22d3 100644 --- a/tests/inference_tests/test_synthesizer.py +++ b/tests/inference_tests/test_synthesizer.py @@ -3,7 +3,7 @@ import unittest from tests import get_tests_output_path from TTS.config import load_config -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.io import save_checkpoint from TTS.tts.utils.text.symbols import make_symbols, phonemes, symbols from TTS.utils.synthesizer import Synthesizer diff --git a/tests/test_extract_tts_spectrograms.py b/tests/test_extract_tts_spectrograms.py index 38cee473..ddc7e4da 100644 --- a/tests/test_extract_tts_spectrograms.py +++ b/tests/test_extract_tts_spectrograms.py @@ -5,7 +5,7 @@ import torch from tests import get_tests_input_path, get_tests_output_path, run_cli from TTS.config import load_config -from TTS.tts.utils.generic_utils import setup_model +from TTS.tts.models import setup_model from TTS.tts.utils.text.symbols import phonemes, symbols torch.manual_seed(1)