adjust imports (tests still work with change)

This commit is contained in:
Brandon Thomas
2022-07-05 02:44:45 -04:00
parent ae38785351
commit 831351e6cb
16 changed files with 46 additions and 40 deletions
+5
View File
@@ -3,3 +3,8 @@
[build-system]
requires = ["setuptools>=42", "wheel"]
build-backend = "setuptools.build_meta"
[tool.pytest.ini_options]
pythonpath = [
"."
]
+7 -7
View File
@@ -1,11 +1,11 @@
from typing import List
from tts.text.pipeline.base_pipeline import BasePipeline
from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence, parse_grapheme_and_arpabet_sequence
from tts.text.pipeline_components.normalization.english_normalization import normalize_english
from tts.text.pipeline_components.phonetization.base_phonetization import BasePhonetization
from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
from tts.text.pipeline_components.sequencing.english_symbols_v1 import SPACE_INTEGER_ENCODING, arpabet_to_sequence, symbols_to_sequence
from text.pipeline.base_pipeline import BasePipeline
from text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence, parse_grapheme_and_arpabet_sequence
from text.pipeline_components.normalization.english_normalization import normalize_english
from text.pipeline_components.phonetization.base_phonetization import BasePhonetization
from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
from text.pipeline_components.sequencing.english_symbols_v1 import SPACE_INTEGER_ENCODING, arpabet_to_sequence, symbols_to_sequence
class EnglishPipelineV1(BasePipeline):
"""
+4 -4
View File
@@ -1,9 +1,9 @@
import re
from typing import List
from tts.text.pipeline.base_pipeline import BasePipeline
from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace, convert_to_ascii, lowercase
from tts.text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers
from tts.text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence
from text.pipeline.base_pipeline import BasePipeline
from text.pipeline_components.normalization.common_cleaners import collapse_whitespace, convert_to_ascii, lowercase
from text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers
from text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence
# Regular expression matching text enclosed in curly braces:
_curly_re = re.compile(r'(.*?)\{(.+?)\}(.*)')
@@ -1,6 +1,6 @@
from tts.text.pipeline.english_pipeline_v1 import EnglishPipelineV1
from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
from text.pipeline.english_pipeline_v1 import EnglishPipelineV1
from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
class TestEnglishPipelineV1:
@@ -1,5 +1,5 @@
from tts.text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline
from text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline
class TestLegacyFakeYouPipeline():
@@ -1,4 +1,4 @@
from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, parse_grapheme_and_arpabet_sequence
from text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, parse_grapheme_and_arpabet_sequence
class TestParser:
@@ -1,7 +1,7 @@
from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace
from tts.text.pipeline_components.normalization.common_cleaners import convert_to_ascii
from tts.text.pipeline_components.normalization.common_cleaners import lowercase
from tts.text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers
from text.pipeline_components.normalization.common_cleaners import collapse_whitespace
from text.pipeline_components.normalization.common_cleaners import convert_to_ascii
from text.pipeline_components.normalization.common_cleaners import lowercase
from text.pipeline_components.normalization.english_cleaners import expand_abbreviations, expand_numbers
def normalize_english(raw_input_text: str) -> str:
text = convert_to_ascii(raw_input_text)
@@ -1,6 +1,6 @@
from tts.text.pipeline_components.normalization.common_cleaners import collapse_whitespace
from tts.text.pipeline_components.normalization.common_cleaners import convert_to_ascii
from tts.text.pipeline_components.normalization.common_cleaners import lowercase
from text.pipeline_components.normalization.common_cleaners import collapse_whitespace
from text.pipeline_components.normalization.common_cleaners import convert_to_ascii
from text.pipeline_components.normalization.common_cleaners import lowercase
def normalize_spanish(raw_input_text: str) -> str:
text = convert_to_ascii(raw_input_text)
@@ -1,4 +1,4 @@
from tts.text.pipeline_components.normalization.english_normalization import normalize_english
from text.pipeline_components.normalization.english_normalization import normalize_english
class TestEnglishNormalization:
@@ -1,7 +1,7 @@
import re
from typing import List
from tts.text.pipeline_components.phonetization.cmudict import CMUDict
from text.pipeline_components.phonetization.cmudict import CMUDict
# Regex taken from open source tacotron2 extensions
_arpabet_split_re = re.compile(r'[^\s]*{.*?}[^\s]*|[\w]+|[^\w\s]+')
@@ -1,7 +1,7 @@
from typing import List
from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence
from tts.text.pipeline_components.phonetization.base_phonetization import BasePhonetization
from tts.text.pipeline_components.phonetization.cmudict import CMUDict
from text.pipeline_components.input_parsing.parser import ArpabetSequence, GraphemeSequence, ParsedSequence
from text.pipeline_components.phonetization.base_phonetization import BasePhonetization
from text.pipeline_components.phonetization.cmudict import CMUDict
class EnglishPhonetization(BasePhonetization):
@@ -1,5 +1,5 @@
from tts.text.pipeline_components.phonetization.cmudict import CMUDict
from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH
from text.pipeline_components.phonetization.cmudict import CMUDict
from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH
class TestCmuDict:
@@ -1,7 +1,7 @@
from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
from tts.text.pipeline_components.input_parsing.parser import ArpabetSequence
from tts.text.pipeline_components.input_parsing.parser import GraphemeSequence
from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH, CMUDict
from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
from text.pipeline_components.input_parsing.parser import ArpabetSequence
from text.pipeline_components.input_parsing.parser import GraphemeSequence
class TestEnglishPhonetization:
@@ -13,7 +13,7 @@ Original documentation:
_characters. See TRAINING_DATA.md for details.
"""
from tts.text.pipeline_components.phonetization import cmudict
from text.pipeline_components.phonetization import cmudict
from typing import List
# NB: DO NOT CHANGE THE ORDER OF SYMBOLS!
@@ -1,4 +1,4 @@
from tts.text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence
from text.pipeline_components.sequencing.english_symbols_v1 import arpabet_to_sequence, symbols_to_sequence
class TestEnglishSymbols:
+5 -4
View File
@@ -1,9 +1,5 @@
import sys
from tts.text.pipeline.english_pipeline_v1 import EnglishPipelineV1
from tts.text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline
from tts.text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH
from tts.text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
sys.path.append('waveglow/')
import shutil
import json
@@ -34,6 +30,11 @@ import subprocess
import magic
import os
from text.pipeline.english_pipeline_v1 import EnglishPipelineV1
from text.pipeline.legacy_fakeyou_pipeline import LegacyFakeYouPipeline
from text.pipeline_components.phonetization.cmudict import DEFAULT_CMUDICT_PATH
from text.pipeline_components.phonetization.english_phonetization import EnglishPhonetization
def print_gpu_info():
print('========================================')
print('Python interpreter', sys.executable)