From 9790eddada5778556e0090ee5c0b657c187e1e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Tue, 22 Jun 2021 03:03:30 +0200 Subject: [PATCH] =?UTF-8?q?Fix=20wrong=20argument=20name=20=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TTS/bin/compute_attention_masks.py | 2 +- TTS/bin/extract_tts_spectrograms.py | 2 +- TTS/tts/models/base_tts.py | 2 +- notebooks/ExtractTTSpectrogram.ipynb | 2 +- tests/data_tests/test_loader.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TTS/bin/compute_attention_masks.py b/TTS/bin/compute_attention_masks.py index 35721f59..cbb441fe 100644 --- a/TTS/bin/compute_attention_masks.py +++ b/TTS/bin/compute_attention_masks.py @@ -89,7 +89,7 @@ Example run: compute_linear_spec=False, ap=ap, meta_data=meta_data, - tp=C.characters if "characters" in C.keys() else None, + characters=c.characters if "characters" in C.keys() else None, add_blank=C["add_blank"] if "add_blank" in C.keys() else False, use_phonemes=C.use_phonemes, phoneme_cache_path=C.phoneme_cache_path, diff --git a/TTS/bin/extract_tts_spectrograms.py b/TTS/bin/extract_tts_spectrograms.py index 11cdfe31..b0159b86 100755 --- a/TTS/bin/extract_tts_spectrograms.py +++ b/TTS/bin/extract_tts_spectrograms.py @@ -27,7 +27,7 @@ def setup_loader(ap, r, verbose=False): compute_linear_spec=False, meta_data=meta_data, ap=ap, - tp=c.characters if "characters" in c.keys() else None, + characters=c.characters if "characters" in c.keys() else None, add_blank=c["add_blank"] if "add_blank" in c.keys() else False, batch_group_size=0, min_seq_len=c.min_seq_len, diff --git a/TTS/tts/models/base_tts.py b/TTS/tts/models/base_tts.py index 1de7ba92..015d0200 100644 --- a/TTS/tts/models/base_tts.py +++ b/TTS/tts/models/base_tts.py @@ -164,7 +164,7 @@ class BaseTTS(BaseModel): compute_linear_spec=config.model.lower() == "tacotron", meta_data=data_items, ap=ap, - tp=config.characters, + characters=config.characters, add_blank=config["add_blank"], batch_group_size=0 if is_eval else config.batch_group_size * config.batch_size, min_seq_len=config.min_seq_len, diff --git a/notebooks/ExtractTTSpectrogram.ipynb b/notebooks/ExtractTTSpectrogram.ipynb index bdc7c955..4e42a3bb 100644 --- a/notebooks/ExtractTTSpectrogram.ipynb +++ b/notebooks/ExtractTTSpectrogram.ipynb @@ -112,7 +112,7 @@ "preprocessor = importlib.import_module('TTS.tts.datasets.preprocess')\n", "preprocessor = getattr(preprocessor, DATASET.lower())\n", "meta_data = preprocessor(DATA_PATH,METADATA_FILE)\n", - "dataset = TTSDataset(checkpoint['r'], C.text_cleaner, False, ap, meta_data,tp=C.characters if 'characters' in C.keys() else None, use_phonemes=C.use_phonemes, phoneme_cache_path=C.phoneme_cache_path, enable_eos_bos=C.enable_eos_bos_chars)\n", + "dataset = TTSDataset(checkpoint['r'], C.text_cleaner, False, ap, meta_data,characters=c.characters if 'characters' in C.keys() else None, use_phonemes=C.use_phonemes, phoneme_cache_path=C.phoneme_cache_path, enable_eos_bos=C.enable_eos_bos_chars)\n", "loader = DataLoader(dataset, batch_size=BATCH_SIZE, num_workers=4, collate_fn=dataset.collate_fn, shuffle=False, drop_last=False)" ] }, diff --git a/tests/data_tests/test_loader.py b/tests/data_tests/test_loader.py index cad89d09..9bc70ddd 100644 --- a/tests/data_tests/test_loader.py +++ b/tests/data_tests/test_loader.py @@ -44,7 +44,7 @@ class TestTTSDataset(unittest.TestCase): compute_linear_spec=True, ap=self.ap, meta_data=items, - tp=c.characters, + characters=c.characters, batch_group_size=bgs, min_seq_len=c.min_seq_len, max_seq_len=float("inf"),