diff --git a/TTS/tts/utils/speakers.py b/TTS/tts/utils/speakers.py index b80e8ee3..f92d3af5 100755 --- a/TTS/tts/utils/speakers.py +++ b/TTS/tts/utils/speakers.py @@ -8,7 +8,7 @@ import torch from TTS.speaker_encoder.utils.generic_utils import setup_model from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.config import load_config def make_speakers_json_path(out_path): diff --git a/TTS/utils/manage.py b/TTS/utils/manage.py index 0cf69706..87e499e7 100644 --- a/TTS/utils/manage.py +++ b/TTS/utils/manage.py @@ -9,7 +9,7 @@ import gdown import requests from TTS.utils.generic_utils import get_user_data_dir -from TTS.utils.io import load_config +from TTS.config import load_config class ModelManager(object): diff --git a/TTS/utils/synthesizer.py b/TTS/utils/synthesizer.py index 323231bf..7d418cb1 100644 --- a/TTS/utils/synthesizer.py +++ b/TTS/utils/synthesizer.py @@ -13,7 +13,7 @@ from TTS.tts.utils.speakers import SpeakerManager from TTS.tts.utils.synthesis import synthesis, trim_silence from TTS.tts.utils.text import make_symbols, phonemes, symbols from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.config import load_config from TTS.vocoder.utils.generic_utils import interpolate_vocoder_input, setup_generator diff --git a/tests/test_glow_tts.py b/tests/test_glow_tts.py index 7e17ed45..77801b29 100644 --- a/tests/test_glow_tts.py +++ b/tests/test_glow_tts.py @@ -9,7 +9,7 @@ from tests import get_tests_input_path from TTS.tts.layers.losses import GlowTTSLoss from TTS.tts.models.glow_tts import GlowTTS from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.tts.configs import GlowTTSConfig # pylint: disable=unused-variable diff --git a/tests/test_speaker_encoder.py b/tests/test_speaker_encoder.py index 32ba2924..3e8dd947 100644 --- a/tests/test_speaker_encoder.py +++ b/tests/test_speaker_encoder.py @@ -6,10 +6,8 @@ import torch as T from tests import get_tests_input_path from TTS.speaker_encoder.losses import AngleProtoLoss, GE2ELoss from TTS.speaker_encoder.model import SpeakerEncoder -from TTS.utils.io import load_config file_path = get_tests_input_path() -c = load_config(os.path.join(file_path, "test_config.json")) class SpeakerEncoderTests(unittest.TestCase): diff --git a/tests/test_speaker_manager.py b/tests/test_speaker_manager.py index b176e353..f8c742d9 100644 --- a/tests/test_speaker_manager.py +++ b/tests/test_speaker_manager.py @@ -6,10 +6,11 @@ import torch from tests import get_tests_input_path from TTS.speaker_encoder.model import SpeakerEncoder -from TTS.speaker_encoder.utils.generic_utils import save_checkpoint +from TTS.speaker_encoder.utils.io import save_checkpoint +from TTS.speaker_encoder.speaker_encoder_config import SpeakerEncoderConfig +from TTS.config import load_config from TTS.tts.utils.speakers import SpeakerManager from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config encoder_config_path = os.path.join(get_tests_input_path(), "test_speaker_encoder_config.json") encoder_model_path = os.path.join(get_tests_input_path(), "checkpoint_0.pth.tar") diff --git a/tests/test_synthesizer.py b/tests/test_synthesizer.py index aa06a6f0..46997dbb 100644 --- a/tests/test_synthesizer.py +++ b/tests/test_synthesizer.py @@ -5,7 +5,7 @@ from tests import get_tests_input_path, get_tests_output_path from TTS.tts.utils.generic_utils 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.io import load_config +from TTS.config import load_config from TTS.utils.synthesizer import Synthesizer diff --git a/tests/test_tacotron2_model.py b/tests/test_tacotron2_model.py index 0e35605f..3a08e4d0 100644 --- a/tests/test_tacotron2_model.py +++ b/tests/test_tacotron2_model.py @@ -9,7 +9,7 @@ from tests import get_tests_input_path from TTS.tts.layers.losses import MSELossMasked from TTS.tts.models.tacotron2 import Tacotron2 from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.tts.configs import Tacotron2Config # pylint: disable=unused-variable diff --git a/tests/test_tacotron2_tf_model.py b/tests/test_tacotron2_tf_model.py index 2c4b4884..aa9c1846 100644 --- a/tests/test_tacotron2_tf_model.py +++ b/tests/test_tacotron2_tf_model.py @@ -5,10 +5,10 @@ import numpy as np import tensorflow as tf import torch -from tests import get_tests_input_path from TTS.tts.tf.models.tacotron2 import Tacotron2 from TTS.tts.tf.utils.tflite import convert_tacotron2_to_tflite, load_tflite_model -from TTS.utils.io import load_config +from TTS.tts.configs import Tacotron2Config + tf.get_logger().setLevel("INFO") diff --git a/tests/test_tacotron_model.py b/tests/test_tacotron_model.py index 72b47d23..d6f5189e 100644 --- a/tests/test_tacotron_model.py +++ b/tests/test_tacotron_model.py @@ -9,7 +9,8 @@ from tests import get_tests_input_path from TTS.tts.layers.losses import L1LossMasked from TTS.tts.models.tacotron import Tacotron from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.tts.configs import TacotronConfig + # pylint: disable=unused-variable diff --git a/tests/test_text_processing.py b/tests/test_text_processing.py index f70056b1..b7b8c501 100644 --- a/tests/test_text_processing.py +++ b/tests/test_text_processing.py @@ -5,9 +5,10 @@ import os # pylint: disable=unused-import from tests import get_tests_input_path, get_tests_path from TTS.tts.utils.text import * -from TTS.utils.io import load_config +from TTS.tts.configs import TacotronConfig -conf = load_config(os.path.join(get_tests_input_path(), "test_config.json")) + +conf = TacotronConfig() def test_phoneme_to_sequence(): diff --git a/tests/vocoder_tests/test_vocoder_losses.py b/tests/vocoder_tests/test_vocoder_losses.py index 87151a05..915c5947 100644 --- a/tests/vocoder_tests/test_vocoder_losses.py +++ b/tests/vocoder_tests/test_vocoder_losses.py @@ -4,7 +4,7 @@ import torch from tests import get_tests_input_path, get_tests_output_path, get_tests_path from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.config import BaseAudioConfig from TTS.vocoder.layers.losses import MelganFeatureLoss, MultiScaleSTFTLoss, STFTLoss, TorchSTFT TESTS_PATH = get_tests_path() diff --git a/tests/vocoder_tests/test_vocoder_wavernn_datasets.py b/tests/vocoder_tests/test_vocoder_wavernn_datasets.py index 7adc1dea..755d4772 100644 --- a/tests/vocoder_tests/test_vocoder_wavernn_datasets.py +++ b/tests/vocoder_tests/test_vocoder_wavernn_datasets.py @@ -6,7 +6,7 @@ from torch.utils.data import DataLoader from tests import get_tests_input_path, get_tests_output_path, get_tests_path from TTS.utils.audio import AudioProcessor -from TTS.utils.io import load_config +from TTS.vocoder.configs import WavernnConfig from TTS.vocoder.datasets.preprocess import load_wav_feat_data, preprocess_wav_files from TTS.vocoder.datasets.wavernn_dataset import WaveRNNDataset