From 39004484b97f41362a4ee7c3ea7267d1776d6a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Tue, 10 Aug 2021 12:56:32 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20=F0=9F=90=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix synthesizer multi-speaker init Fix #712 --- TTS/server/server.py | 4 ++-- TTS/trainer.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TTS/server/server.py b/TTS/server/server.py index e90d93e6..5d66d9eb 100644 --- a/TTS/server/server.py +++ b/TTS/server/server.py @@ -103,8 +103,8 @@ synthesizer = Synthesizer( model_path, config_path, speakers_file_path, vocoder_path, vocoder_config_path, use_cuda=args.use_cuda ) -use_multi_speaker = synthesizer.tts_model.speaker_manager is not None and synthesizer.tts_model.num_speakers > 1 -speaker_manager = synthesizer.tts_model.speaker_manager if hasattr(synthesizer.tts_model, "speaker_manager") else None +use_multi_speaker = hasattr(synthesizer.tts_model, "speaker_manager") and synthesizer.tts_model.num_speakers > 1 +speaker_manager = getattr(synthesizer.tts_model, "speaker_manager", None) # TODO: set this from SpeakerManager use_gst = synthesizer.tts_config.get("use_gst", False) app = Flask(__name__) diff --git a/TTS/trainer.py b/TTS/trainer.py index 669fb971..4267f120 100644 --- a/TTS/trainer.py +++ b/TTS/trainer.py @@ -820,7 +820,7 @@ class Trainer: """🏃 train -> evaluate -> test for the number of epochs.""" if self.restore_step != 0 or self.args.best_path: print(" > Restoring best loss from " f"{os.path.basename(self.args.best_path)} ...") - self.best_loss = load_fsspec(self.args.best_path, map_location="cpu")["model_loss"] + self.best_loss = load_fsspec(self.args.restore_path, map_location="cpu")["model_loss"] print(f" > Starting with loaded last best loss {self.best_loss}.") self.total_steps_done = self.restore_step