Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix if else statement #1050

Merged
merged 2 commits into from
Jan 3, 2022
Merged

Fix if else statement #1050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fad969
Fix if else statement
erogol Jan 3, 2022
fc09e31
Prioritize the given encoder path over config
erogol Jan 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions TTS/utils/synthesizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def _load_tts(self, tts_checkpoint: str, tts_config_path: str, use_cuda: bool) -

speaker_manager = self._init_speaker_manager()
language_manager = self._init_language_manager()
self._set_speaker_encoder_paths_from_tts_config()
if not self.encoder_checkpoint:
self._set_speaker_encoder_paths_from_tts_config()
speaker_manager = self._init_speaker_encoder(speaker_manager)

if language_manager is not None:
Expand Down Expand Up @@ -168,14 +169,14 @@ def _init_speaker_manager(self):
if self._is_use_speaker_embedding():
if self.tts_speakers_file:
speaker_manager = SpeakerManager(speaker_id_file_path=self.tts_speakers_file)
if speakers_file:
elif speakers_file:
speaker_manager = SpeakerManager(speaker_id_file_path=speakers_file)

if self._is_use_d_vector_file():
d_vector_file = get_from_config_or_model_args_with_default(self.tts_config, "d_vector_file", None)
if self.tts_speakers_file:
speaker_manager = SpeakerManager(d_vectors_file_path=self.tts_speakers_file)
if d_vector_file:
elif d_vector_file:
speaker_manager = SpeakerManager(d_vectors_file_path=d_vector_file)
return speaker_manager

Expand Down