diff --git a/TTS/tts/layers/glow_tts/encoder.py b/TTS/tts/layers/glow_tts/encoder.py index 48bb3008..71aee94f 100644 --- a/TTS/tts/layers/glow_tts/encoder.py +++ b/TTS/tts/layers/glow_tts/encoder.py @@ -9,7 +9,7 @@ from TTS.tts.layers.generic.time_depth_sep_conv import TimeDepthSeparableConvBlo from TTS.tts.layers.glow_tts.duration_predictor import DurationPredictor from TTS.tts.layers.glow_tts.glow import ResidualConv1dLayerNormBlock from TTS.tts.layers.glow_tts.transformer import RelativePositionTransformer -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask class Encoder(nn.Module): diff --git a/TTS/tts/layers/glow_tts/monotonic_align/__init__.py b/TTS/tts/layers/glow_tts/monotonic_align/__init__.py index 7be124f4..5cbfd8fc 100644 --- a/TTS/tts/layers/glow_tts/monotonic_align/__init__.py +++ b/TTS/tts/layers/glow_tts/monotonic_align/__init__.py @@ -2,7 +2,7 @@ import numpy as np import torch from torch.nn import functional as F -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask try: # TODO: fix pypi cython installation problem. diff --git a/TTS/tts/models/align_tts.py b/TTS/tts/models/align_tts.py index e097ac50..db04b72c 100644 --- a/TTS/tts/models/align_tts.py +++ b/TTS/tts/models/align_tts.py @@ -7,7 +7,7 @@ from TTS.tts.layers.feed_forward.duration_predictor import DurationPredictor from TTS.tts.layers.feed_forward.encoder import Encoder from TTS.tts.layers.generic.pos_encoding import PositionalEncoding from TTS.tts.layers.glow_tts.monotonic_align import generate_path, maximum_path -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask class AlignTTS(nn.Module): diff --git a/TTS/tts/models/glow_tts.py b/TTS/tts/models/glow_tts.py index 19eb594a..ca059ab9 100755 --- a/TTS/tts/models/glow_tts.py +++ b/TTS/tts/models/glow_tts.py @@ -6,8 +6,11 @@ from torch.nn import functional as F from TTS.tts.layers.glow_tts.decoder import Decoder from TTS.tts.layers.glow_tts.encoder import Encoder +from TTS.tts.utils.measures import alignment_diagonal_score +from TTS.tts.utils.visual import plot_alignment, plot_spectrogram +from TTS.utils.audio import AudioProcessor from TTS.tts.layers.glow_tts.monotonic_align import generate_path, maximum_path -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask class GlowTTS(nn.Module): diff --git a/TTS/tts/models/speedy_speech.py b/TTS/tts/models/speedy_speech.py index 9880b82b..bc6e912c 100644 --- a/TTS/tts/models/speedy_speech.py +++ b/TTS/tts/models/speedy_speech.py @@ -6,7 +6,7 @@ from TTS.tts.layers.feed_forward.duration_predictor import DurationPredictor from TTS.tts.layers.feed_forward.encoder import Encoder from TTS.tts.layers.generic.pos_encoding import PositionalEncoding from TTS.tts.layers.glow_tts.monotonic_align import generate_path -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask class SpeedySpeech(nn.Module): diff --git a/tests/tts_tests/test_feed_forward_layers.py b/tests/tts_tests/test_feed_forward_layers.py index 1db980a3..1c2d3803 100644 --- a/tests/tts_tests/test_feed_forward_layers.py +++ b/tests/tts_tests/test_feed_forward_layers.py @@ -2,7 +2,7 @@ import torch from TTS.tts.layers.feed_forward.decoder import Decoder from TTS.tts.layers.feed_forward.encoder import Encoder -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu") diff --git a/tests/tts_tests/test_speedy_speech_layers.py b/tests/tts_tests/test_speedy_speech_layers.py index 3473769b..21a73812 100644 --- a/tests/tts_tests/test_speedy_speech_layers.py +++ b/tests/tts_tests/test_speedy_speech_layers.py @@ -2,7 +2,7 @@ import torch from TTS.tts.layers.feed_forward.duration_predictor import DurationPredictor from TTS.tts.models.speedy_speech import SpeedySpeech -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask use_cuda = torch.cuda.is_available() device = torch.device("cuda:0" if torch.cuda.is_available() else "cpu") diff --git a/tests/tts_tests/test_tacotron_layers.py b/tests/tts_tests/test_tacotron_layers.py index 9b89e645..6c4b76b5 100644 --- a/tests/tts_tests/test_tacotron_layers.py +++ b/tests/tts_tests/test_tacotron_layers.py @@ -4,7 +4,7 @@ import torch as T from TTS.tts.layers.losses import L1LossMasked, SSIMLoss from TTS.tts.layers.tacotron.tacotron import CBHG, Decoder, Encoder, Prenet -from TTS.tts.utils.generic_utils import sequence_mask +from TTS.tts.utils.data import sequence_mask # pylint: disable=unused-variable