From d39bc74f57b4b5c28dde88e1f66f6072199d35d3 Mon Sep 17 00:00:00 2001 From: thennal10 Date: Wed, 1 Mar 2023 13:41:30 +0530 Subject: [PATCH] OverFlow with test sentences (#2253) * Fix typo in function definiton * Swap hasattr out hasattr(self, "speaker_manager") and hasattr(self, "language_manager") seems to be redundant since BaseTTS defines both. --- TTS/tts/models/base_tts.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TTS/tts/models/base_tts.py b/TTS/tts/models/base_tts.py index 2059612d..dc53edd0 100644 --- a/TTS/tts/models/base_tts.py +++ b/TTS/tts/models/base_tts.py @@ -111,7 +111,7 @@ class BaseTTS(BaseTrainerModel): """Prepare and return `aux_input` used by `forward()`""" return {"speaker_id": None, "style_wav": None, "d_vector": None, "language_id": None} - def get_aux_input_from_test_setences(self, sentence_info): + def get_aux_input_from_test_sentences(self, sentence_info): if hasattr(self.config, "model_args"): config = self.config.model_args else: @@ -134,7 +134,7 @@ class BaseTTS(BaseTrainerModel): # get speaker id/d_vector speaker_id, d_vector, language_id = None, None, None - if hasattr(self, "speaker_manager"): + if self.speaker_manager is not None: if config.use_d_vector_file: if speaker_name is None: d_vector = self.speaker_manager.get_random_embedding() @@ -147,7 +147,7 @@ class BaseTTS(BaseTrainerModel): speaker_id = self.speaker_manager.name_to_id[speaker_name] # get language id - if hasattr(self, "language_manager") and config.use_language_embedding and language_name is not None: + if self.language_manager is not None and config.use_language_embedding and language_name is not None: language_id = self.language_manager.name_to_id[language_name] return { @@ -287,7 +287,7 @@ class BaseTTS(BaseTrainerModel): loader = None else: # setup multi-speaker attributes - if hasattr(self, "speaker_manager") and self.speaker_manager is not None: + if self.speaker_manager is not None: if hasattr(config, "model_args"): speaker_id_mapping = ( self.speaker_manager.name_to_id if config.model_args.use_speaker_embedding else None @@ -302,7 +302,7 @@ class BaseTTS(BaseTrainerModel): d_vector_mapping = None # setup multi-lingual attributes - if hasattr(self, "language_manager") and self.language_manager is not None: + if self.language_manager is not None: language_id_mapping = self.language_manager.name_to_id if self.args.use_language_embedding else None else: language_id_mapping = None @@ -424,7 +424,7 @@ class BaseTTS(BaseTrainerModel): print(f" > `speakers.pth` is saved to {output_path}.") print(" > `speakers_file` is updated in the config.json.") - if hasattr(self, "language_manager") and self.language_manager is not None: + if self.language_manager is not None: output_path = os.path.join(trainer.output_path, "language_ids.json") self.language_manager.save_ids_to_file(output_path) trainer.config.language_ids_file = output_path