From 45fbc0d0038e9632a05397e4028e121d0185ae7a Mon Sep 17 00:00:00 2001 From: erogol Date: Thu, 13 Aug 2020 12:42:48 +0200 Subject: [PATCH] convolution encoder with GLU and res connections --- TTS/tts/layers/glow_tts/glow.py | 2 +- TTS/tts/models/glow_tts.py | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/TTS/tts/layers/glow_tts/glow.py b/TTS/tts/layers/glow_tts/glow.py index b560db21..045909dc 100644 --- a/TTS/tts/layers/glow_tts/glow.py +++ b/TTS/tts/layers/glow_tts/glow.py @@ -65,7 +65,7 @@ class ConvLayerNorm(nn.Module): self.proj.bias.data.zero_() def forward(self, x, x_mask): - x_org = x + x_res = x for i in range(self.num_layers): x = self.conv_layers[i](x * x_mask) x = self.norm_layers[i](x * x_mask) diff --git a/TTS/tts/models/glow_tts.py b/TTS/tts/models/glow_tts.py index 67212a36..245f6252 100644 --- a/TTS/tts/models/glow_tts.py +++ b/TTS/tts/models/glow_tts.py @@ -69,20 +69,15 @@ class GlowTts(nn.Module): self.length_scale=1. self.encoder = Encoder(num_chars, - out_channels, - hidden_channels_enc or hidden_channels, - filter_channels, - filter_channels_dp, - encoder_type, - num_heads, - num_layers_enc, - kernel_size, - dropout_p, - rel_attn_window_size=rel_attn_window_size, - input_length=input_length, - mean_only=mean_only, - use_prenet=True, - c_in_channels=c_in_channels) + out_channels=out_channels, + hidden_channels=hidden_channels, + filter_channels=filter_channels, + filter_channels_dp=filter_channels_dp, + num_layers=num_layers_enc, + kernel_size=kernel_size, + dropout_p=dropout_p, + mean_only=mean_only, + c_in_channels=c_in_channels) self.decoder = Decoder(out_channels, hidden_channels_dec or hidden_channels,