From 18d9ec8036d343344eae7d394a7bcffd33535275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Fri, 9 Apr 2021 00:54:59 +0200 Subject: [PATCH] format with black --- TTS/bin/convert_melgan_torch_to_tf.py | 7 +++++-- TTS/bin/synthesize.py | 1 + TTS/bin/train_encoder.py | 9 +++++++-- TTS/bin/train_glow_tts.py | 1 + TTS/bin/train_speedy_speech.py | 1 + TTS/bin/train_tacotron.py | 10 ++++++++-- TTS/bin/train_vocoder_gan.py | 1 + TTS/bin/train_vocoder_wavegrad.py | 1 + TTS/bin/train_vocoder_wavernn.py | 1 - TTS/tts/layers/feed_forward/encoder.py | 4 +--- TTS/utils/synthesizer.py | 1 + TTS/vocoder/tf/models/melgan_generator.py | 1 - 12 files changed, 27 insertions(+), 11 deletions(-) diff --git a/TTS/bin/convert_melgan_torch_to_tf.py b/TTS/bin/convert_melgan_torch_to_tf.py index ba8e186a..43581348 100644 --- a/TTS/bin/convert_melgan_torch_to_tf.py +++ b/TTS/bin/convert_melgan_torch_to_tf.py @@ -7,8 +7,11 @@ import tensorflow as tf import torch from TTS.utils.io import load_config -from TTS.vocoder.tf.utils.convert_torch_to_tf_utils import (compare_torch_tf, convert_tf_name, - transfer_weights_torch_to_tf) +from TTS.vocoder.tf.utils.convert_torch_to_tf_utils import ( + compare_torch_tf, + convert_tf_name, + transfer_weights_torch_to_tf, +) from TTS.vocoder.tf.utils.generic_utils import setup_generator as setup_tf_generator from TTS.vocoder.tf.utils.io import save_checkpoint from TTS.vocoder.utils.generic_utils import setup_generator diff --git a/TTS/bin/synthesize.py b/TTS/bin/synthesize.py index bec41a60..aca245bb 100755 --- a/TTS/bin/synthesize.py +++ b/TTS/bin/synthesize.py @@ -4,6 +4,7 @@ import argparse import sys from argparse import RawTextHelpFormatter + # pylint: disable=redefined-outer-name, unused-argument from pathlib import Path diff --git a/TTS/bin/train_encoder.py b/TTS/bin/train_encoder.py index 5a3f59af..3a3f876e 100644 --- a/TTS/bin/train_encoder.py +++ b/TTS/bin/train_encoder.py @@ -17,8 +17,13 @@ from TTS.speaker_encoder.utils.generic_utils import check_config_speaker_encoder from TTS.speaker_encoder.utils.visual import plot_embeddings from TTS.tts.datasets.preprocess import load_meta_data from TTS.utils.audio import AudioProcessor -from TTS.utils.generic_utils import (count_parameters, create_experiment_folder, get_git_branch, - remove_experiment_folder, set_init_dict) +from TTS.utils.generic_utils import ( + count_parameters, + create_experiment_folder, + get_git_branch, + remove_experiment_folder, + set_init_dict, +) from TTS.utils.io import copy_model_files, load_config from TTS.utils.radam import RAdam from TTS.utils.tensorboard_logger import TensorboardLogger diff --git a/TTS/bin/train_glow_tts.py b/TTS/bin/train_glow_tts.py index ec27574c..d3b3d0e2 100644 --- a/TTS/bin/train_glow_tts.py +++ b/TTS/bin/train_glow_tts.py @@ -8,6 +8,7 @@ import traceback from random import randrange import torch + # DISTRIBUTED from torch.nn.parallel import DistributedDataParallel as DDP_th from torch.utils.data import DataLoader diff --git a/TTS/bin/train_speedy_speech.py b/TTS/bin/train_speedy_speech.py index d27af5a8..3adbe513 100644 --- a/TTS/bin/train_speedy_speech.py +++ b/TTS/bin/train_speedy_speech.py @@ -9,6 +9,7 @@ from random import randrange import numpy as np import torch + # DISTRIBUTED from torch.nn.parallel import DistributedDataParallel as DDP_th from torch.utils.data import DataLoader diff --git a/TTS/bin/train_tacotron.py b/TTS/bin/train_tacotron.py index aee13cac..c8346c3a 100644 --- a/TTS/bin/train_tacotron.py +++ b/TTS/bin/train_tacotron.py @@ -26,8 +26,14 @@ from TTS.utils.audio import AudioProcessor from TTS.utils.distribute import DistributedSampler, apply_gradient_allreduce, init_distributed, reduce_tensor from TTS.utils.generic_utils import KeepAverage, count_parameters, remove_experiment_folder, set_init_dict from TTS.utils.radam import RAdam -from TTS.utils.training import (NoamLR, adam_weight_decay, check_update, gradual_training_scheduler, set_weight_decay, - setup_torch_training_env) +from TTS.utils.training import ( + NoamLR, + adam_weight_decay, + check_update, + gradual_training_scheduler, + set_weight_decay, + setup_torch_training_env, +) use_cuda, num_gpus = setup_torch_training_env(True, False) diff --git a/TTS/bin/train_vocoder_gan.py b/TTS/bin/train_vocoder_gan.py index 6546e6ed..af8a4385 100644 --- a/TTS/bin/train_vocoder_gan.py +++ b/TTS/bin/train_vocoder_gan.py @@ -9,6 +9,7 @@ import traceback from inspect import signature import torch + # DISTRIBUTED from torch.nn.parallel import DistributedDataParallel as DDP_th from torch.utils.data import DataLoader diff --git a/TTS/bin/train_vocoder_wavegrad.py b/TTS/bin/train_vocoder_wavegrad.py index 104e18de..1f039a67 100644 --- a/TTS/bin/train_vocoder_wavegrad.py +++ b/TTS/bin/train_vocoder_wavegrad.py @@ -8,6 +8,7 @@ import traceback import numpy as np import torch + # DISTRIBUTED from torch.nn.parallel import DistributedDataParallel as DDP_th from torch.optim import Adam diff --git a/TTS/bin/train_vocoder_wavernn.py b/TTS/bin/train_vocoder_wavernn.py index 3f6f5836..8a2d8d3a 100644 --- a/TTS/bin/train_vocoder_wavernn.py +++ b/TTS/bin/train_vocoder_wavernn.py @@ -25,7 +25,6 @@ from TTS.vocoder.utils.io import save_best_model, save_checkpoint # from torch.utils.data.distributed import DistributedSampler - use_cuda, num_gpus = setup_torch_training_env(True, True) diff --git a/TTS/tts/layers/feed_forward/encoder.py b/TTS/tts/layers/feed_forward/encoder.py index bb87ffbb..caf939ff 100644 --- a/TTS/tts/layers/feed_forward/encoder.py +++ b/TTS/tts/layers/feed_forward/encoder.py @@ -147,9 +147,7 @@ class Encoder(nn.Module): in_hidden_channels == out_channels ), "[!] must be `in_channels` == `out_channels` when encoder type is 'fftransformer'" # pylint: disable=unexpected-keyword-arg - self.encoder = FFTransformerBlock( - in_hidden_channels, **encoder_params - ) + self.encoder = FFTransformerBlock(in_hidden_channels, **encoder_params) else: raise NotImplementedError(" [!] unknown encoder type.") diff --git a/TTS/utils/synthesizer.py b/TTS/utils/synthesizer.py index fb15a16c..64a1b88c 100644 --- a/TTS/utils/synthesizer.py +++ b/TTS/utils/synthesizer.py @@ -6,6 +6,7 @@ import torch from TTS.tts.utils.generic_utils import setup_model from TTS.tts.utils.speakers import load_speaker_mapping + # pylint: disable=unused-wildcard-import # pylint: disable=wildcard-import from TTS.tts.utils.synthesis import synthesis, trim_silence diff --git a/TTS/vocoder/tf/models/melgan_generator.py b/TTS/vocoder/tf/models/melgan_generator.py index 1a0fa103..f432a20c 100644 --- a/TTS/vocoder/tf/models/melgan_generator.py +++ b/TTS/vocoder/tf/models/melgan_generator.py @@ -9,7 +9,6 @@ os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3" # FATAL logging.getLogger("tensorflow").setLevel(logging.FATAL) - # pylint: disable=too-many-ancestors # pylint: disable=abstract-method class MelganGenerator(tf.keras.models.Model):