From b702b39b52753c731881ce01d3edbf7e88f06ed3 Mon Sep 17 00:00:00 2001 From: Eren G??lge Date: Mon, 6 Nov 2023 19:02:09 +0100 Subject: [PATCH] Make style --- TTS/tts/models/base_tacotron.py | 7 ++++++- TTS/tts/models/tortoise.py | 7 ++++++- recipes/ljspeech/xtts_v1/train_gpt_xtts.py | 4 +--- recipes/ljspeech/xtts_v2/train_gpt_xtts.py | 4 +--- tests/xtts_tests/test_xtts_gpt_train.py | 4 +--- tests/xtts_tests/test_xtts_v2-0_gpt_train.py | 4 +--- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/TTS/tts/models/base_tacotron.py b/TTS/tts/models/base_tacotron.py index 4aaf5261..f38dace2 100644 --- a/TTS/tts/models/base_tacotron.py +++ b/TTS/tts/models/base_tacotron.py @@ -252,7 +252,12 @@ class BaseTacotron(BaseTTS): def compute_capacitron_VAE_embedding(self, inputs, reference_mel_info, text_info=None, speaker_embedding=None): """Capacitron Variational Autoencoder""" - (VAE_outputs, posterior_distribution, prior_distribution, capacitron_beta,) = self.capacitron_vae_layer( + ( + VAE_outputs, + posterior_distribution, + prior_distribution, + capacitron_beta, + ) = self.capacitron_vae_layer( reference_mel_info, text_info, speaker_embedding, # pylint: disable=not-callable diff --git a/TTS/tts/models/tortoise.py b/TTS/tts/models/tortoise.py index c8cfcfdd..16644ff9 100644 --- a/TTS/tts/models/tortoise.py +++ b/TTS/tts/models/tortoise.py @@ -676,7 +676,12 @@ class Tortoise(BaseTTS): ), "Too much text provided. Break the text up into separate segments and re-try inference." if voice_samples is not None: - (auto_conditioning, diffusion_conditioning, _, _,) = self.get_conditioning_latents( + ( + auto_conditioning, + diffusion_conditioning, + _, + _, + ) = self.get_conditioning_latents( voice_samples, return_mels=True, latent_averaging_mode=latent_averaging_mode, diff --git a/recipes/ljspeech/xtts_v1/train_gpt_xtts.py b/recipes/ljspeech/xtts_v1/train_gpt_xtts.py index 65d3ccd0..02e35dfd 100644 --- a/recipes/ljspeech/xtts_v1/train_gpt_xtts.py +++ b/recipes/ljspeech/xtts_v1/train_gpt_xtts.py @@ -97,9 +97,7 @@ def main(): use_ne_hifigan=True, # if it is true it will keep the non-enhanced keys on the output checkpoint ) # define audio config - audio_config = XttsAudioConfig( - sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000 - ) + audio_config = XttsAudioConfig(sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000) # training parameters config config = GPTTrainerConfig( output_path=OUT_PATH, diff --git a/recipes/ljspeech/xtts_v2/train_gpt_xtts.py b/recipes/ljspeech/xtts_v2/train_gpt_xtts.py index 3bb68e2f..4d06fed1 100644 --- a/recipes/ljspeech/xtts_v2/train_gpt_xtts.py +++ b/recipes/ljspeech/xtts_v2/train_gpt_xtts.py @@ -98,9 +98,7 @@ def main(): gpt_use_perceiver_resampler=True, ) # define audio config - audio_config = XttsAudioConfig( - sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000 - ) + audio_config = XttsAudioConfig(sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000) # training parameters config config = GPTTrainerConfig( output_path=OUT_PATH, diff --git a/tests/xtts_tests/test_xtts_gpt_train.py b/tests/xtts_tests/test_xtts_gpt_train.py index 09df98ef..83cf537f 100644 --- a/tests/xtts_tests/test_xtts_gpt_train.py +++ b/tests/xtts_tests/test_xtts_gpt_train.py @@ -88,9 +88,7 @@ model_args = GPTArgs( gpt_stop_audio_token=8193, use_ne_hifigan=True, ) -audio_config = XttsAudioConfig( - sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000 -) +audio_config = XttsAudioConfig(sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000) config = GPTTrainerConfig( epochs=1, output_path=OUT_PATH, diff --git a/tests/xtts_tests/test_xtts_v2-0_gpt_train.py b/tests/xtts_tests/test_xtts_v2-0_gpt_train.py index 0851a4e2..b9f6438e 100644 --- a/tests/xtts_tests/test_xtts_v2-0_gpt_train.py +++ b/tests/xtts_tests/test_xtts_v2-0_gpt_train.py @@ -88,9 +88,7 @@ model_args = GPTArgs( gpt_use_perceiver_resampler=True, use_ne_hifigan=True, ) -audio_config = XttsAudioConfig( - sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000 -) +audio_config = XttsAudioConfig(sample_rate=22050, dvae_sample_rate=22050, output_sample_rate=24000) config = GPTTrainerConfig( epochs=1, output_path=OUT_PATH,