From f4c720544013d0eb28b7f8cfb858b355a1a5e6ef Mon Sep 17 00:00:00 2001
From: KP <109694228@qq.com>
Date: Wed, 2 Mar 2022 12:42:20 +0800
Subject: [PATCH] refactor

---
 paddleaudio/paddleaudio/compliance/kaldi.py  | 2 +-
 paddleaudio/paddleaudio/datasets/__init__.py | 7 -------
 paddleaudio/paddleaudio/datasets/dataset.py  | 4 ++--
 paddleaudio/paddleaudio/features/__init__.py | 7 ++++---
 paddleaudio/paddleaudio/metric/mcd.py        | 1 +
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/paddleaudio/paddleaudio/compliance/kaldi.py b/paddleaudio/paddleaudio/compliance/kaldi.py
index 61ca4e3d..e4192e81 100644
--- a/paddleaudio/paddleaudio/compliance/kaldi.py
+++ b/paddleaudio/paddleaudio/compliance/kaldi.py
@@ -17,8 +17,8 @@ from typing import Tuple
 import paddle
 from paddle import Tensor
 
+from ..functional import create_dct
 from ..functional.window import get_window
-from .spectrum import create_dct
 
 __all__ = [
     'spectrogram',
diff --git a/paddleaudio/paddleaudio/datasets/__init__.py b/paddleaudio/paddleaudio/datasets/__init__.py
index 8d2fdab4..5c5f0369 100644
--- a/paddleaudio/paddleaudio/datasets/__init__.py
+++ b/paddleaudio/paddleaudio/datasets/__init__.py
@@ -15,10 +15,3 @@ from .esc50 import ESC50
 from .gtzan import GTZAN
 from .tess import TESS
 from .urban_sound import UrbanSound8K
-
-__all__ = [
-    'ESC50',
-    'UrbanSound8K',
-    'GTZAN',
-    'TESS',
-]
diff --git a/paddleaudio/paddleaudio/datasets/dataset.py b/paddleaudio/paddleaudio/datasets/dataset.py
index 7a57fd6c..06e2df6d 100644
--- a/paddleaudio/paddleaudio/datasets/dataset.py
+++ b/paddleaudio/paddleaudio/datasets/dataset.py
@@ -17,8 +17,8 @@ import numpy as np
 import paddle
 
 from ..backends import load as load_audio
-from ..features import melspectrogram
-from ..features import mfcc
+from ..compliance.librosa import melspectrogram
+from ..compliance.librosa import mfcc
 
 feat_funcs = {
     'raw': None,
diff --git a/paddleaudio/paddleaudio/features/__init__.py b/paddleaudio/paddleaudio/features/__init__.py
index 469b4c9b..00781397 100644
--- a/paddleaudio/paddleaudio/features/__init__.py
+++ b/paddleaudio/paddleaudio/features/__init__.py
@@ -11,6 +11,7 @@
 # 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 .librosa import LogMelSpectrogram
-from .librosa import MelSpectrogram
-from .librosa import Spectrogram
+from .layers import LogMelSpectrogram
+from .layers import MelSpectrogram
+from .layers import MFCC
+from .layers import Spectrogram
diff --git a/paddleaudio/paddleaudio/metric/mcd.py b/paddleaudio/paddleaudio/metric/mcd.py
index 281e5765..465cd5a4 100644
--- a/paddleaudio/paddleaudio/metric/mcd.py
+++ b/paddleaudio/paddleaudio/metric/mcd.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import mcd.metrics_fast as mt
+import numpy as np
 from mcd import dtw
 
 __all__ = [
-- 
GitLab