refactor(vc): rename TTS.vc.modules to TTS.vc.layers for consistency

Same as in TTS.tts and TTS.vocoder
idiap · Dec 2, 2024 · a89f269 · a89f269
1 parent bafc9ff
commit a89f269
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 13 deletions.
diff --git a/TTS/vc/modules/__init__.py → TTS/vc/layers/__init__.py b/TTS/vc/modules/__init__.py → TTS/vc/layers/__init__.py
diff --git a/TTS/vc/modules/freevc/__init__.py → TTS/vc/layers/freevc/__init__.py b/TTS/vc/modules/freevc/__init__.py → TTS/vc/layers/freevc/__init__.py
diff --git a/TTS/vc/modules/freevc/commons.py → TTS/vc/layers/freevc/commons.py b/TTS/vc/modules/freevc/commons.py → TTS/vc/layers/freevc/commons.py
diff --git a/TTS/vc/modules/freevc/mel_processing.py → TTS/vc/layers/freevc/mel_processing.py b/TTS/vc/modules/freevc/mel_processing.py → TTS/vc/layers/freevc/mel_processing.py
diff --git a/TTS/vc/modules/freevc/modules.py → TTS/vc/layers/freevc/modules.py b/TTS/vc/modules/freevc/modules.py → TTS/vc/layers/freevc/modules.py
@@ -7,7 +7,7 @@
 
 from TTS.tts.layers.generic.normalization import LayerNorm2
 from TTS.tts.layers.generic.wavenet import fused_add_tanh_sigmoid_multiply
-from TTS.vc.modules.freevc.commons import init_weights
+from TTS.vc.layers.freevc.commons import init_weights
 from TTS.vocoder.models.hifigan_generator import get_padding
 
 LRELU_SLOPE = 0.1

diff --git a/...odules/freevc/speaker_encoder/__init__.py → ...layers/freevc/speaker_encoder/__init__.py b/...odules/freevc/speaker_encoder/__init__.py → ...layers/freevc/speaker_encoder/__init__.py
diff --git a/...c/modules/freevc/speaker_encoder/audio.py → ...vc/layers/freevc/speaker_encoder/audio.py b/...c/modules/freevc/speaker_encoder/audio.py → ...vc/layers/freevc/speaker_encoder/audio.py
@@ -5,7 +5,7 @@
 import librosa
 import numpy as np
 
-from TTS.vc.modules.freevc.speaker_encoder.hparams import (
+from TTS.vc.layers.freevc.speaker_encoder.hparams import (
     audio_norm_target_dBFS,
     mel_n_channels,
     mel_window_length,

diff --git a/...modules/freevc/speaker_encoder/hparams.py → .../layers/freevc/speaker_encoder/hparams.py b/...modules/freevc/speaker_encoder/hparams.py → .../layers/freevc/speaker_encoder/hparams.py
diff --git a/...freevc/speaker_encoder/speaker_encoder.py → ...freevc/speaker_encoder/speaker_encoder.py b/...freevc/speaker_encoder/speaker_encoder.py → ...freevc/speaker_encoder/speaker_encoder.py
@@ -7,8 +7,8 @@
 from torch import nn
 from trainer.io import load_fsspec
 
-from TTS.vc.modules.freevc.speaker_encoder import audio
-from TTS.vc.modules.freevc.speaker_encoder.hparams import (
+from TTS.vc.layers.freevc.speaker_encoder import audio
+from TTS.vc.layers.freevc.speaker_encoder.hparams import (
     mel_n_channels,
     mel_window_step,
     model_embedding_size,

diff --git a/TTS/vc/modules/freevc/wavlm/__init__.py → TTS/vc/layers/freevc/wavlm/__init__.py b/TTS/vc/modules/freevc/wavlm/__init__.py → TTS/vc/layers/freevc/wavlm/__init__.py
@@ -6,7 +6,7 @@
 from trainer.io import get_user_data_dir
 
 from TTS.utils.generic_utils import is_pytorch_at_least_2_4
-from TTS.vc.modules.freevc.wavlm.wavlm import WavLM, WavLMConfig
+from TTS.vc.layers.freevc.wavlm.wavlm import WavLM, WavLMConfig
 
 logger = logging.getLogger(__name__)
 

diff --git a/TTS/vc/modules/freevc/wavlm/config.json → TTS/vc/layers/freevc/wavlm/config.json b/TTS/vc/modules/freevc/wavlm/config.json → TTS/vc/layers/freevc/wavlm/config.json
diff --git a/TTS/vc/modules/freevc/wavlm/modules.py → TTS/vc/layers/freevc/wavlm/modules.py b/TTS/vc/modules/freevc/wavlm/modules.py → TTS/vc/layers/freevc/wavlm/modules.py
diff --git a/TTS/vc/modules/freevc/wavlm/wavlm.py → TTS/vc/layers/freevc/wavlm/wavlm.py b/TTS/vc/modules/freevc/wavlm/wavlm.py → TTS/vc/layers/freevc/wavlm/wavlm.py
@@ -17,7 +17,7 @@
 import torch.nn.functional as F
 from torch.nn import LayerNorm
 
-from TTS.vc.modules.freevc.wavlm.modules import (
+from TTS.vc.layers.freevc.wavlm.modules import (
     Fp32GroupNorm,
     Fp32LayerNorm,
     GLU_Linear,

diff --git a/TTS/vc/models/freevc.py b/TTS/vc/models/freevc.py
@@ -12,17 +12,16 @@
 from torch.nn.utils.parametrize import remove_parametrizations
 from trainer.io import load_fsspec
 
-import TTS.vc.modules.freevc.commons as commons
-import TTS.vc.modules.freevc.modules as modules
+import TTS.vc.layers.freevc.modules as modules
 from TTS.tts.layers.vits.discriminator import DiscriminatorS
 from TTS.tts.utils.helpers import sequence_mask
 from TTS.tts.utils.speakers import SpeakerManager
 from TTS.vc.configs.freevc_config import FreeVCConfig
+from TTS.vc.layers.freevc.commons import init_weights, rand_slice_segments
+from TTS.vc.layers.freevc.mel_processing import mel_spectrogram_torch
+from TTS.vc.layers.freevc.speaker_encoder.speaker_encoder import SpeakerEncoder as SpeakerEncoderEx
+from TTS.vc.layers.freevc.wavlm import get_wavlm
 from TTS.vc.models.base_vc import BaseVC
-from TTS.vc.modules.freevc.commons import init_weights
-from TTS.vc.modules.freevc.mel_processing import mel_spectrogram_torch
-from TTS.vc.modules.freevc.speaker_encoder.speaker_encoder import SpeakerEncoder as SpeakerEncoderEx
-from TTS.vc.modules.freevc.wavlm import get_wavlm
 from TTS.vocoder.models.hifigan_discriminator import DiscriminatorP
 
 logger = logging.getLogger(__name__)
@@ -385,7 +384,7 @@ def forward(
         z_p = self.flow(z, spec_mask, g=g)
 
         # Randomly slice z and compute o using dec
-        z_slice, ids_slice = commons.rand_slice_segments(z, spec_lengths, self.segment_size)
+        z_slice, ids_slice = rand_slice_segments(z, spec_lengths, self.segment_size)
         o = self.dec(z_slice, g=g)
 
         return o, ids_slice, spec_mask, (z, z_p, m_p, logs_p, m_q, logs_q)