diff --git a/examples/transformer_tts/preprocess.py b/examples/transformer_tts/preprocess.py index 670227e..af6360d 100644 --- a/examples/transformer_tts/preprocess.py +++ b/examples/transformer_tts/preprocess.py @@ -19,10 +19,10 @@ from pathlib import Path import tqdm import numpy as np - -from parakeet.datasets import LJSpeechMetaData -from parakeet.audio import AudioProcessor, LogMagnitude -from parakeet.frontend import English +from parakeet.audio.audio import AudioProcessor +from parakeet.audio.spec_normalizer import LogMagnitude +from parakeet.datasets.ljspeech import LJSpeechMetaData +from parakeet.frontend.phonectic import English from config import get_cfg_defaults diff --git a/examples/transformer_tts/train.py b/examples/transformer_tts/train.py index e2da676..50a1eb1 100644 --- a/examples/transformer_tts/train.py +++ b/examples/transformer_tts/train.py @@ -21,7 +21,7 @@ from paddle import distributed as dist from paddle.io import DataLoader, DistributedBatchSampler from parakeet.data import dataset -from parakeet.frontend import English +from parakeet.frontend.phonectic import English from parakeet.models.transformer_tts import TransformerTTS, TransformerTTSLoss from parakeet.utils import scheduler, mp_tools, display from parakeet.training.cli import default_argument_parser diff --git a/parakeet/frontend/phonectic.py b/parakeet/frontend/phonectic.py index 81674bf..2366225 100644 --- a/parakeet/frontend/phonectic.py +++ b/parakeet/frontend/phonectic.py @@ -17,7 +17,7 @@ from abc import abstractmethod from g2p_en import G2p from g2pM import G2pM -from parakeet.frontend import Vocab +from parakeet.frontend.vocab import Vocab from parakeet.frontend.normalizer.normalizer import normalize from parakeet.frontend.punctuation import get_punctuations diff --git a/parakeet/models/transformer_tts.py b/parakeet/models/transformer_tts.py index 4ec943a..77ddec8 100644 --- a/parakeet/models/transformer_tts.py +++ b/parakeet/models/transformer_tts.py @@ -370,7 +370,7 @@ class CNNPostNet(nn.Layer): class TransformerTTS(nn.Layer): def __init__(self, - frontend: parakeet.frontend.Phonetics, + frontend: parakeet.frontend.phonectic.Phonetics, d_encoder: int, d_decoder: int, d_mel: int,