diff --git a/TTS/.models.json b/TTS/.models.json index 0fb187a4..440ca7a9 100644 --- a/TTS/.models.json +++ b/TTS/.models.json @@ -76,12 +76,12 @@ } } }, - "zh":{ + "zh-CN":{ "baker":{ "tacotron2-DDC-GST":{ - "model_file": "1RR9rZdV_FMm8yvtCHALtUbJf1nxbUiAw", - "config_file": "1daY1JHGXEozJ-MGYLiWEUmzEwEvM5xpz", - "stats_file": "1vl9c-D3dW_E7pdhNpDFQLX-giJc0jOtV", + "model_file": "1SYpv7V__QYDjKXa_vJmNXo1CSkcoZovy", + "config_file": "14BIvfJXnFHi3jcxYNX40__TR6RwJOZqi", + "stats_file": "1ECRlXybT6rAWp269CkhjUPwcZ10CkcqD", "commit": "" } } diff --git a/TTS/bin/train_tacotron.py b/TTS/bin/train_tacotron.py index 2ceee8cc..0887c2cc 100644 --- a/TTS/bin/train_tacotron.py +++ b/TTS/bin/train_tacotron.py @@ -655,7 +655,6 @@ def main(args): # pylint: disable=redefined-outer-name ) - if __name__ == '__main__': args = parse_arguments(sys.argv) c, OUT_PATH, AUDIO_PATH, c_logger, tb_logger = process_args( diff --git a/TTS/server/static/TTS_circle.png b/TTS/server/static/TTS_circle.png deleted file mode 100644 index 34755811..00000000 Binary files a/TTS/server/static/TTS_circle.png and /dev/null differ diff --git a/TTS/tts/utils/text/__init__.py b/TTS/tts/utils/text/__init__.py index 4f4a38ea..2a724650 100644 --- a/TTS/tts/utils/text/__init__.py +++ b/TTS/tts/utils/text/__init__.py @@ -41,7 +41,7 @@ def text2phone(text, language): ''' # TO REVIEW : How to have a good implementation for this? - if language == "chinese-mandarin": + if language == "zh-CN": ph = chinese_text_to_phonemes(text) return ph diff --git a/notebooks/Chinese_Mandarin_DDC_GST_Tacotron2_TTS_and_MultiBand_MelGAN_Example.ipynb b/notebooks/Chinese_Mandarin_DDC_GST_Tacotron2_TTS_and_MultiBand_MelGAN_Example.ipynb index 709dbb8d..82166bc0 100644 --- a/notebooks/Chinese_Mandarin_DDC_GST_Tacotron2_TTS_and_MultiBand_MelGAN_Example.ipynb +++ b/notebooks/Chinese_Mandarin_DDC_GST_Tacotron2_TTS_and_MultiBand_MelGAN_Example.ipynb @@ -64,9 +64,9 @@ ], "source": [ "! mkdir data/\n", - "! gdown --id 1RR9rZdV_FMm8yvtCHALtUbJf1nxbUiAw -O data/tts_model.pth.tar\n", - "! gdown --id 1daY1JHGXEozJ-MGYLiWEUmzEwEvM5xpz -O data/tts_config.json\n", - "! gdown --id 1vl9c-D3dW_E7pdhNpDFQLX-giJc0jOtV -O data/tts_scale_stats.npy" + "! gdown --id 1SYpv7V__QYDjKXa_vJmNXo1CSkcoZovy -O data/tts_model.pth.tar\n", + "! gdown --id 14BIvfJXnFHi3jcxYNX40__TR6RwJOZqi -O data/tts_config.json\n", + "! gdown --id 1ECRlXybT6rAWp269CkhjUPwcZ10CkcqD -O data/tts_scale_stats.npy" ] }, { diff --git a/tests/test_text_processing.py b/tests/test_text_processing.py index 646f2592..2ea8e8f9 100644 --- a/tests/test_text_processing.py +++ b/tests/test_text_processing.py @@ -17,7 +17,7 @@ def test_phoneme_to_sequence(): lang = "en-us" sequence = phoneme_to_sequence(text, text_cleaner, lang) text_hat = sequence_to_phoneme(sequence) - _ = phoneme_to_sequence(text, text_cleaner, lang, tp=conf.characters) + sequence_with_params = phoneme_to_sequence(text, text_cleaner, lang, tp=conf.characters) text_hat_with_params = sequence_to_phoneme(sequence, tp=conf.characters) gt = 'ɹiːsənt ɹᵻsɜːtʃ æt hɑːɹvɚd hɐz ʃoʊn mɛdᵻteɪɾɪŋ fɔːɹ æz lɪɾəl æz eɪt wiːks kæn æktʃuːəli ɪŋkɹiːs, ðə ɡɹeɪ mæɾɚɹ ɪnðə pɑːɹts ʌvðə bɹeɪn ɹᵻspɑːnsᵻbəl fɔːɹ ɪmoʊʃənəl ɹɛɡjʊleɪʃən ænd lɜːnɪŋ!' assert text_hat == text_hat_with_params == gt