From 773f1db6fa93802e754416643cef59410cfaeffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eren=20G=C3=B6lge?= Date: Thu, 8 Apr 2021 11:14:10 +0200 Subject: [PATCH] refactor HifiGAN discriminator --- TTS/vocoder/models/hifigan_discriminator.py | 8 +++----- TTS/vocoder/models/hifigan_generator.py | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/TTS/vocoder/models/hifigan_discriminator.py b/TTS/vocoder/models/hifigan_discriminator.py index d506a56b..8e824b6b 100644 --- a/TTS/vocoder/models/hifigan_discriminator.py +++ b/TTS/vocoder/models/hifigan_discriminator.py @@ -204,8 +204,6 @@ class HifiganDiscriminator(nn.Module): List[Tensor]: discriminator scores. List[List[Tensor]]: list of list of features from each layers of each discriminator. """ - scores, feats = self.msd(x) - scores_, feats_ = self.mpd(x) - scores += scores_ - feats += feats_ - return scores, feats + scores, feats = self.mpd(x) + scores_, feats_ = self.msd(x) + return scores + scores_, feats + feats_ diff --git a/TTS/vocoder/models/hifigan_generator.py b/TTS/vocoder/models/hifigan_generator.py index 8545e828..11d0390a 100644 --- a/TTS/vocoder/models/hifigan_generator.py +++ b/TTS/vocoder/models/hifigan_generator.py @@ -1,3 +1,4 @@ +# adopted from https://github.com/jik876/hifi-gan/blob/master/models.py import torch import torch.nn.functional as F import torch.nn as nn