Fix tests

This commit is contained in:
WeberJulian 2021-11-23 16:00:38 +01:00 committed by Eren Gölge
parent 79f75924de
commit 9c1bec86a4
3 changed files with 11 additions and 11 deletions

View File

@ -596,7 +596,7 @@ class Vits(BaseTTS):
# language embedding # language embedding
lang_emb = None lang_emb = None
if hasattr(self, "emb_l"): if self.args.use_language_embedding and lid is not None:
lang_emb = self.emb_l(lid).unsqueeze(-1) lang_emb = self.emb_l(lid).unsqueeze(-1)
x, m_p, logs_p, x_mask = self.text_encoder(x, x_lengths, lang_emb=lang_emb) x, m_p, logs_p, x_mask = self.text_encoder(x, x_lengths, lang_emb=lang_emb)

View File

@ -10,7 +10,7 @@ config_path = os.path.join(get_tests_output_path(), "test_model_config.json")
output_path = os.path.join(get_tests_output_path(), "train_outputs") output_path = os.path.join(get_tests_output_path(), "train_outputs")
dataset_config1 = BaseDatasetConfig( dataset_config_en = BaseDatasetConfig(
name="ljspeech", name="ljspeech",
meta_file_train="metadata.csv", meta_file_train="metadata.csv",
meta_file_val="metadata.csv", meta_file_val="metadata.csv",
@ -18,12 +18,12 @@ dataset_config1 = BaseDatasetConfig(
language="en", language="en",
) )
dataset_config2 = BaseDatasetConfig( dataset_config_pt = BaseDatasetConfig(
name="ljspeech", name="ljspeech",
meta_file_train="metadata.csv", meta_file_train="metadata.csv",
meta_file_val="metadata.csv", meta_file_val="metadata.csv",
path="tests/data/ljspeech", path="tests/data/ljspeech",
language="en2", language="pt-br",
) )
config = VitsConfig( config = VitsConfig(
@ -43,9 +43,9 @@ config = VitsConfig(
print_eval=True, print_eval=True,
test_sentences=[ test_sentences=[
["Be a voice, not an echo.", "ljspeech-0", None, "en"], ["Be a voice, not an echo.", "ljspeech-0", None, "en"],
["Be a voice, not an echo.", "ljspeech-1", None, "en2"], ["Be a voice, not an echo.", "ljspeech-1", None, "pt-br"],
], ],
datasets=[dataset_config1, dataset_config2], datasets=[dataset_config_en, dataset_config_pt],
) )
# set audio config # set audio config
config.audio.do_trim_silence = True config.audio.do_trim_silence = True

View File

@ -10,7 +10,7 @@ config_path = os.path.join(get_tests_output_path(), "test_model_config.json")
output_path = os.path.join(get_tests_output_path(), "train_outputs") output_path = os.path.join(get_tests_output_path(), "train_outputs")
dataset_config1 = BaseDatasetConfig( dataset_config_en = BaseDatasetConfig(
name="ljspeech", name="ljspeech",
meta_file_train="metadata.csv", meta_file_train="metadata.csv",
meta_file_val="metadata.csv", meta_file_val="metadata.csv",
@ -18,12 +18,12 @@ dataset_config1 = BaseDatasetConfig(
language="en", language="en",
) )
dataset_config2 = BaseDatasetConfig( dataset_config_pt = BaseDatasetConfig(
name="ljspeech", name="ljspeech",
meta_file_train="metadata.csv", meta_file_train="metadata.csv",
meta_file_val="metadata.csv", meta_file_val="metadata.csv",
path="tests/data/ljspeech", path="tests/data/ljspeech",
language="en2", language="pt-br",
) )
config = VitsConfig( config = VitsConfig(
@ -43,9 +43,9 @@ config = VitsConfig(
print_eval=True, print_eval=True,
test_sentences=[ test_sentences=[
["Be a voice, not an echo.", "ljspeech", None, "en"], ["Be a voice, not an echo.", "ljspeech", None, "en"],
["Be a voice, not an echo.", "ljspeech", None, "en2"], ["Be a voice, not an echo.", "ljspeech", None, "pt-br"],
], ],
datasets=[dataset_config1, dataset_config2], datasets=[dataset_config_en, dataset_config_pt],
) )
# set audio config # set audio config
config.audio.do_trim_silence = True config.audio.do_trim_silence = True