add __init__ for models

PaddlePaddle · Oct 12, 2021 · 4b94af9 · 4b94af9
1 parent 73cb215
commit 4b94af9
Show file tree

Hide file tree

Showing 21 changed files with 115 additions and 49 deletions.
diff --git a/examples/GANVocoder/parallelwave_gan/baker/synthesize_from_wav.py b/examples/GANVocoder/parallelwave_gan/baker/synthesize_from_wav.py
@@ -23,8 +23,8 @@
 import soundfile as sf
 import yaml
 from parakeet.data.get_feats import LogMelFBank
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 from yacs.config import CfgNode as Configuration
 

diff --git a/examples/GANVocoder/parallelwave_gan/synthesize.py b/examples/GANVocoder/parallelwave_gan/synthesize.py
@@ -24,7 +24,7 @@
 import yaml
 from paddle import distributed as dist
 from parakeet.datasets.data_table import DataTable
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGGenerator
 from yacs.config import CfgNode
 
 

diff --git a/examples/GANVocoder/parallelwave_gan/train.py b/examples/GANVocoder/parallelwave_gan/train.py
@@ -30,10 +30,10 @@
 from paddle.optimizer.lr import StepDecay
 from parakeet.datasets.data_table import DataTable
 from parakeet.datasets.vocoder_batch_fn import Clip
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGDiscriminator
-from parakeet.models.parallel_wavegan.parallel_wavegan_updater import PWGUpdater
-from parakeet.models.parallel_wavegan.parallel_wavegan_updater import PWGEvaluator
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGDiscriminator
+from parakeet.models.parallel_wavegan import PWGUpdater
+from parakeet.models.parallel_wavegan import PWGEvaluator
 from parakeet.modules.stft_loss import MultiResolutionSTFTLoss
 from parakeet.training.extensions.snapshot import Snapshot
 from parakeet.training.extensions.visualizer import VisualDL

diff --git a/examples/fastspeech2/aishell3/synthesize_e2e.py b/examples/fastspeech2/aishell3/synthesize_e2e.py
@@ -21,10 +21,10 @@
 import soundfile as sf
 import yaml
 from parakeet.frontend.zh_frontend import Frontend
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2Inference
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.fastspeech2 import FastSpeech2
+from parakeet.models.fastspeech2 import FastSpeech2Inference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 from yacs.config import CfgNode
 

diff --git a/examples/fastspeech2/baker/synthesize_e2e.py b/examples/fastspeech2/baker/synthesize_e2e.py
@@ -21,10 +21,10 @@
 import soundfile as sf
 import yaml
 from parakeet.frontend.zh_frontend import Frontend
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2Inference
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.fastspeech2 import FastSpeech2
+from parakeet.models.fastspeech2 import FastSpeech2Inference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 from yacs.config import CfgNode
 

diff --git a/examples/fastspeech2/ljspeech/synthesize_e2e.py b/examples/fastspeech2/ljspeech/synthesize_e2e.py
@@ -22,10 +22,10 @@
 import yaml
 from yacs.config import CfgNode
 from parakeet.frontend import English
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2Inference
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.fastspeech2 import FastSpeech2
+from parakeet.models.fastspeech2 import FastSpeech2Inference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 
 

diff --git a/examples/fastspeech2/synthesize.py b/examples/fastspeech2/synthesize.py
@@ -23,10 +23,10 @@
 import yaml
 from yacs.config import CfgNode
 from parakeet.datasets.data_table import DataTable
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2Inference
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.fastspeech2 import FastSpeech2
+from parakeet.models.fastspeech2 import FastSpeech2Inference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 
 

diff --git a/examples/fastspeech2/train.py b/examples/fastspeech2/train.py
@@ -23,13 +23,14 @@
 import yaml
 from paddle import DataParallel
 from paddle import distributed as dist
-from paddle.io import DataLoader, DistributedBatchSampler
+from paddle.io import DataLoader
+from paddle.io import DistributedBatchSampler
 from parakeet.datasets.data_table import DataTable
 from parakeet.datasets.am_batch_fn import fastspeech2_single_spk_batch_fn
 from parakeet.datasets.am_batch_fn import fastspeech2_multi_spk_batch_fn
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2
-from parakeet.models.fastspeech2.fastspeech2_updater import FastSpeech2Evaluator
-from parakeet.models.fastspeech2.fastspeech2_updater import FastSpeech2Updater
+from parakeet.models.fastspeech2 import FastSpeech2
+from parakeet.models.fastspeech2 import FastSpeech2Evaluator
+from parakeet.models.fastspeech2 import FastSpeech2Updater
 from parakeet.training.extensions.snapshot import Snapshot
 from parakeet.training.extensions.visualizer import VisualDL
 from parakeet.training.optimizer import build_optimizers

diff --git a/examples/speedyspeech/baker/synthesize_e2e.py b/examples/speedyspeech/baker/synthesize_e2e.py
@@ -24,10 +24,10 @@
 from paddle import jit
 from paddle.static import InputSpec
 from parakeet.frontend.zh_frontend import Frontend
-from parakeet.models.speedyspeech.speedyspeech import SpeedySpeech
-from parakeet.models.speedyspeech.speedyspeech import SpeedySpeechInference
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.speedyspeech import SpeedySpeech
+from parakeet.models.speedyspeech import SpeedySpeechInference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 from yacs.config import CfgNode
 

diff --git a/examples/speedyspeech/synthesize.py b/examples/speedyspeech/synthesize.py
@@ -26,10 +26,10 @@
 from yacs.config import CfgNode
 
 from parakeet.datasets.data_table import DataTable
-from parakeet.models.speedyspeech.speedyspeech import SpeedySpeech
-from parakeet.models.speedyspeech.speedyspeech import SpeedySpeechInference
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGGenerator
-from parakeet.models.parallel_wavegan.parallel_wavegan import PWGInference
+from parakeet.models.speedyspeech import SpeedySpeech
+from parakeet.models.speedyspeech import SpeedySpeechInference
+from parakeet.models.parallel_wavegan import PWGGenerator
+from parakeet.models.parallel_wavegan import PWGInference
 from parakeet.modules.normalizer import ZScore
 
 

diff --git a/examples/speedyspeech/train.py b/examples/speedyspeech/train.py
@@ -27,9 +27,9 @@
 from paddle.io import DistributedBatchSampler
 from parakeet.datasets.data_table import DataTable
 from parakeet.datasets.am_batch_fn import speedyspeech_batch_fn
-from parakeet.models.speedyspeech.speedyspeech import SpeedySpeech
-from parakeet.models.speedyspeech.speedyspeech_updater import SpeedySpeechEvaluator
-from parakeet.models.speedyspeech.speedyspeech_updater import SpeedySpeechUpdater
+from parakeet.models.speedyspeech import SpeedySpeech
+from parakeet.models.speedyspeech import SpeedySpeechEvaluator
+from parakeet.models.speedyspeech import SpeedySpeechUpdater
 from parakeet.training.extensions.snapshot import Snapshot
 from parakeet.training.extensions.visualizer import VisualDL
 from parakeet.training.optimizer import build_optimizers

diff --git a/examples/transformer_tts/ljspeech/synthesize_e2e.py b/examples/transformer_tts/ljspeech/synthesize_e2e.py
@@ -22,8 +22,8 @@
 import yaml
 from yacs.config import CfgNode
 from parakeet.frontend import English
-from parakeet.models.transformer_tts.transformer_tts import TransformerTTS
-from parakeet.models.transformer_tts.transformer_tts import TransformerTTSInference
+from parakeet.models.transformer_tts import TransformerTTS
+from parakeet.models.transformer_tts import TransformerTTSInference
 from parakeet.models.waveflow import ConditionalWaveFlow
 from parakeet.modules.normalizer import ZScore
 from parakeet.utils import layer_tools

diff --git a/examples/transformer_tts/synthesize.py b/examples/transformer_tts/synthesize.py
@@ -23,8 +23,8 @@
 import yaml
 from yacs.config import CfgNode
 from parakeet.datasets.data_table import DataTable
-from parakeet.models.transformer_tts.transformer_tts import TransformerTTS
-from parakeet.models.transformer_tts.transformer_tts import TransformerTTSInference
+from parakeet.models.transformer_tts import TransformerTTS
+from parakeet.models.transformer_tts import TransformerTTSInference
 from parakeet.models.waveflow import ConditionalWaveFlow
 from parakeet.modules.normalizer import ZScore
 from parakeet.utils import layer_tools

diff --git a/examples/transformer_tts/train.py b/examples/transformer_tts/train.py
@@ -28,9 +28,9 @@
 from paddle.io import DistributedBatchSampler
 from parakeet.datasets.data_table import DataTable
 from parakeet.datasets.am_batch_fn import transformer_single_spk_batch_fn
-from parakeet.models.transformer_tts.transformer_tts import TransformerTTS
-from parakeet.models.transformer_tts.transformer_tts_updater import TransformerTTSUpdater
-from parakeet.models.transformer_tts.transformer_tts_updater import TransformerTTSEvaluator
+from parakeet.models.transformer_tts import TransformerTTS
+from parakeet.models.transformer_tts import TransformerTTSUpdater
+from parakeet.models.transformer_tts import TransformerTTSEvaluator
 from parakeet.training.extensions.snapshot import Snapshot
 from parakeet.training.extensions.visualizer import VisualDL
 from parakeet.training.optimizer import build_optimizers

diff --git a/parakeet/models/fastspeech2/__init__.py b/parakeet/models/fastspeech2/__init__.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from .fastspeech2 import *
+from .fastspeech2_updater import *
diff --git a/parakeet/models/fastspeech2/fastspeech2_updater.py b/parakeet/models/fastspeech2/fastspeech2_updater.py
@@ -14,7 +14,7 @@
 import logging
 
 from paddle import distributed as dist
-from parakeet.models.fastspeech2.fastspeech2 import FastSpeech2Loss
+from parakeet.models.fastspeech2 import FastSpeech2Loss
 from parakeet.training.extensions.evaluator import StandardEvaluator
 from parakeet.training.reporter import report
 from parakeet.training.updaters.standard_updater import StandardUpdater

diff --git a/parakeet/models/parallel_wavegan/__init__.py b/parakeet/models/parallel_wavegan/__init__.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from .parallel_wavegan import *
+from .parallel_wavegan_updater import *
diff --git a/parakeet/models/speedyspeech/__init__.py b/parakeet/models/speedyspeech/__init__.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from .speedyspeech import *
+from .speedyspeech_updater import *
diff --git a/parakeet/models/speedyspeech/speedyspeech_updater.py b/parakeet/models/speedyspeech/speedyspeech_updater.py
@@ -17,7 +17,8 @@
 from paddle import distributed as dist
 from paddle.fluid.layers import huber_loss
 from paddle.nn import functional as F
-from parakeet.modules.losses import masked_l1_loss, weighted_mean
+from parakeet.modules.losses import masked_l1_loss
+from parakeet.modules.losses import weighted_mean
 from parakeet.modules.ssim import ssim
 from parakeet.training.extensions.evaluator import StandardEvaluator
 from parakeet.training.reporter import report

diff --git a/parakeet/models/transformer_tts/__init__.py b/parakeet/models/transformer_tts/__init__.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from .transformer_tts import *
+from .transformer_tts_updater import *
diff --git a/parakeet/models/transformer_tts/transformer_tts_updater.py b/parakeet/models/transformer_tts/transformer_tts_updater.py
@@ -16,8 +16,8 @@
 
 import paddle
 from paddle import distributed as dist
-from parakeet.models.transformer_tts.transformer_tts import GuidedMultiHeadAttentionLoss
-from parakeet.models.transformer_tts.transformer_tts import TransformerTTSLoss
+from parakeet.models.transformer_tts import GuidedMultiHeadAttentionLoss
+from parakeet.models.transformer_tts import TransformerTTSLoss
 from parakeet.training.extensions.evaluator import StandardEvaluator
 from parakeet.training.reporter import report
 from parakeet.training.updaters.standard_updater import StandardUpdater