From 2deccb6eb3d2b1b115c45af5dd108e81043d2b34 Mon Sep 17 00:00:00 2001 From: Matthew Boakes Date: Wed, 8 Nov 2023 20:05:55 +0000 Subject: [PATCH] Corrected Code Style --- TTS/tts/layers/delightful_tts/conv_layers.py | 2 +- TTS/tts/layers/delightful_tts/kernel_predictor.py | 6 ++++-- TTS/tts/layers/generic/wavenet.py | 2 +- TTS/tts/layers/tortoise/vocoder.py | 8 ++++++-- TTS/vocoder/layers/hifigan.py | 4 +++- TTS/vocoder/models/univnet_generator.py | 2 +- TTS/vocoder/models/wavegrad.py | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/TTS/tts/layers/delightful_tts/conv_layers.py b/TTS/tts/layers/delightful_tts/conv_layers.py index 7d5690e9..fb9aa449 100644 --- a/TTS/tts/layers/delightful_tts/conv_layers.py +++ b/TTS/tts/layers/delightful_tts/conv_layers.py @@ -3,7 +3,7 @@ from typing import Tuple import torch import torch.nn as nn # pylint: disable=consider-using-from-import import torch.nn.functional as F -import torch.nn.utils.parametrize as parametrize +from torch.nn.utils import parametrize from TTS.tts.layers.delightful_tts.kernel_predictor import KernelPredictor diff --git a/TTS/tts/layers/delightful_tts/kernel_predictor.py b/TTS/tts/layers/delightful_tts/kernel_predictor.py index 52a5f8cb..96c550b6 100644 --- a/TTS/tts/layers/delightful_tts/kernel_predictor.py +++ b/TTS/tts/layers/delightful_tts/kernel_predictor.py @@ -1,5 +1,5 @@ import torch.nn as nn # pylint: disable=consider-using-from-import -import torch.nn.utils.parametrize as parametrize +from torch.nn.utils import parametrize class KernelPredictor(nn.Module): @@ -37,7 +37,9 @@ class KernelPredictor(nn.Module): kpnet_bias_channels = conv_out_channels * conv_layers # l_b self.input_conv = nn.Sequential( - nn.utils.parametrizations.weight_norm(nn.Conv1d(cond_channels, kpnet_hidden_channels, 5, padding=2, bias=True)), + nn.utils.parametrizations.weight_norm( + nn.Conv1d(cond_channels, kpnet_hidden_channels, 5, padding=2, bias=True) + ), getattr(nn, kpnet_nonlinear_activation)(**kpnet_nonlinear_activation_params), ) diff --git a/TTS/tts/layers/generic/wavenet.py b/TTS/tts/layers/generic/wavenet.py index 84ba06c4..f8de63b4 100644 --- a/TTS/tts/layers/generic/wavenet.py +++ b/TTS/tts/layers/generic/wavenet.py @@ -1,6 +1,6 @@ import torch -import torch.nn.utils.parametrize as parametrize from torch import nn +from torch.nn.utils import parametrize @torch.jit.script diff --git a/TTS/tts/layers/tortoise/vocoder.py b/TTS/tts/layers/tortoise/vocoder.py index a382fce7..a5200c26 100644 --- a/TTS/tts/layers/tortoise/vocoder.py +++ b/TTS/tts/layers/tortoise/vocoder.py @@ -44,7 +44,9 @@ class KernelPredictor(torch.nn.Module): kpnet_bias_channels = conv_out_channels * conv_layers # l_b self.input_conv = nn.Sequential( - nn.utils.parametrizations.weight_norm(nn.Conv1d(cond_channels, kpnet_hidden_channels, 5, padding=2, bias=True)), + nn.utils.parametrizations.weight_norm( + nn.Conv1d(cond_channels, kpnet_hidden_channels, 5, padding=2, bias=True) + ), getattr(nn, kpnet_nonlinear_activation)(**kpnet_nonlinear_activation_params), ) @@ -314,7 +316,9 @@ class UnivNetGenerator(nn.Module): ) ) - self.conv_pre = nn.utils.parametrizations.weight_norm(nn.Conv1d(noise_dim, channel_size, 7, padding=3, padding_mode="reflect")) + self.conv_pre = nn.utils.parametrizations.weight_norm( + nn.Conv1d(noise_dim, channel_size, 7, padding=3, padding_mode="reflect") + ) self.conv_post = nn.Sequential( nn.LeakyReLU(lReLU_slope), diff --git a/TTS/vocoder/layers/hifigan.py b/TTS/vocoder/layers/hifigan.py index f5d7f779..8dd75133 100644 --- a/TTS/vocoder/layers/hifigan.py +++ b/TTS/vocoder/layers/hifigan.py @@ -11,7 +11,9 @@ class ResStack(nn.Module): resstack += [ nn.LeakyReLU(0.2), nn.ReflectionPad1d(dilation), - nn.utils.parametrizations.weight_norm(nn.Conv1d(channel, channel, kernel_size=kernel, dilation=dilation)), + nn.utils.parametrizations.weight_norm( + nn.Conv1d(channel, channel, kernel_size=kernel, dilation=dilation) + ), nn.LeakyReLU(0.2), nn.ReflectionPad1d(padding), nn.utils.parametrizations.weight_norm(nn.Conv1d(channel, channel, kernel_size=1)), diff --git a/TTS/vocoder/models/univnet_generator.py b/TTS/vocoder/models/univnet_generator.py index 7586a6cf..5e66b70d 100644 --- a/TTS/vocoder/models/univnet_generator.py +++ b/TTS/vocoder/models/univnet_generator.py @@ -3,7 +3,7 @@ from typing import List import numpy as np import torch import torch.nn.functional as F -import torch.nn.utils.parametrize as parametrize +from torch.nn.utils import parametrize from TTS.vocoder.layers.lvc_block import LVCBlock diff --git a/TTS/vocoder/models/wavegrad.py b/TTS/vocoder/models/wavegrad.py index e366fc8a..c1166e09 100644 --- a/TTS/vocoder/models/wavegrad.py +++ b/TTS/vocoder/models/wavegrad.py @@ -6,10 +6,10 @@ import torch from coqpit import Coqpit from torch import nn from torch.nn.utils.parametrizations import weight_norm +from torch.nn.utils.parametrize import remove_parametrizations from torch.utils.data import DataLoader from torch.utils.data.distributed import DistributedSampler from trainer.trainer_utils import get_optimizer, get_scheduler -from torch.nn.utils.parametrize import remove_parametrizations from TTS.utils.io import load_fsspec from TTS.vocoder.datasets import WaveGradDataset