From ef4ea9e527b4092d5196de5efee87064f94c0a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Mon, 31 May 2021 10:07:12 +0200 Subject: [PATCH] update imports for `formatters` --- TTS/bin/compute_attention_masks.py | 2 +- TTS/bin/find_unique_chars.py | 6 +++--- notebooks/dataset_analysis/AnalyzeDataset.ipynb | 2 +- notebooks/dataset_analysis/PhonemeCoverage.ipynb | 2 +- tests/data_tests/test_dataset_formatters.py | 2 +- tests/data_tests/test_loader.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TTS/bin/compute_attention_masks.py b/TTS/bin/compute_attention_masks.py index 3cbf40ba..eb708040 100644 --- a/TTS/bin/compute_attention_masks.py +++ b/TTS/bin/compute_attention_masks.py @@ -80,7 +80,7 @@ Example run: model.eval() # data loader - preprocessor = importlib.import_module("TTS.tts.datasets.preprocess") + preprocessor = importlib.import_module("TTS.tts.datasets.formatters") preprocessor = getattr(preprocessor, args.dataset) meta_data = preprocessor(args.data_path, args.dataset_metafile) dataset = TTSDataset( diff --git a/TTS/bin/find_unique_chars.py b/TTS/bin/find_unique_chars.py index 7891d65a..75169569 100644 --- a/TTS/bin/find_unique_chars.py +++ b/TTS/bin/find_unique_chars.py @@ -3,14 +3,14 @@ import argparse import os from argparse import RawTextHelpFormatter -from TTS.tts.datasets.preprocess import get_preprocessor_by_name +from TTS.tts.datasets.formatters import get_preprocessor_by_name def main(): # pylint: disable=bad-option-value parser = argparse.ArgumentParser( description="""Find all the unique characters or phonemes in a dataset.\n\n""" - """Target dataset must be defined in TTS.tts.datasets.preprocess\n\n""" + """Target dataset must be defined in TTS.tts.datasets.formatters\n\n""" """ Example runs: @@ -20,7 +20,7 @@ def main(): ) parser.add_argument( - "--dataset", type=str, default="", help="One of the target dataset names in TTS.tts.datasets.preprocess." + "--dataset", type=str, default="", help="One of the target dataset names in TTS.tts.datasets.formatters." ) parser.add_argument("--meta_file", type=str, default=None, help="Path to the transcriptions file of the dataset.") diff --git a/notebooks/dataset_analysis/AnalyzeDataset.ipynb b/notebooks/dataset_analysis/AnalyzeDataset.ipynb index 8aa3a025..6ff2d2ca 100644 --- a/notebooks/dataset_analysis/AnalyzeDataset.ipynb +++ b/notebooks/dataset_analysis/AnalyzeDataset.ipynb @@ -31,7 +31,7 @@ "from multiprocessing import Pool\n", "from matplotlib import pylab as plt\n", "from collections import Counter\n", - "from TTS.tts.datasets.preprocess import *\n", + "from TTS.tts.datasets.formatters import *\n", "%matplotlib inline" ] }, diff --git a/notebooks/dataset_analysis/PhonemeCoverage.ipynb b/notebooks/dataset_analysis/PhonemeCoverage.ipynb index f9540d06..e659511a 100644 --- a/notebooks/dataset_analysis/PhonemeCoverage.ipynb +++ b/notebooks/dataset_analysis/PhonemeCoverage.ipynb @@ -50,7 +50,7 @@ "source": [ "# import stuff\n", "from TTS.utils.io import load_config\n", - "from TTS.tts.datasets.preprocess import load_meta_data\n", + "from TTS.tts.datasets.formatters import load_meta_data\n", "from TTS.tts.utils.text import phoneme_to_sequence, sequence_to_phoneme\n", "from tqdm import tqdm\n", "from matplotlib import pylab as plt\n", diff --git a/tests/data_tests/test_dataset_formatters.py b/tests/data_tests/test_dataset_formatters.py index 968e2a29..bd83002c 100644 --- a/tests/data_tests/test_dataset_formatters.py +++ b/tests/data_tests/test_dataset_formatters.py @@ -2,7 +2,7 @@ import os import unittest from tests import get_tests_input_path -from TTS.tts.datasets.preprocess import common_voice +from TTS.tts.datasets.formatters import common_voice class TestPreprocessors(unittest.TestCase): diff --git a/tests/data_tests/test_loader.py b/tests/data_tests/test_loader.py index 053da516..7f55b378 100644 --- a/tests/data_tests/test_loader.py +++ b/tests/data_tests/test_loader.py @@ -9,7 +9,7 @@ from torch.utils.data import DataLoader from tests import get_tests_output_path from TTS.tts.configs import BaseTTSConfig from TTS.tts.datasets import TTSDataset -from TTS.tts.datasets.preprocess import ljspeech +from TTS.tts.datasets.formatters import ljspeech from TTS.utils.audio import AudioProcessor # pylint: disable=unused-variable