From ea5483d8c905b1721204cfa30a0413ac92ae97a0 Mon Sep 17 00:00:00 2001 From: YangZhou Date: Tue, 29 Nov 2022 14:29:31 +0800 Subject: [PATCH] benchmark:replace paddleaudio.layer.feature with features in paddle --- audio/tests/benchmark/log_melspectrogram.py | 2 +- audio/tests/benchmark/melspectrogram.py | 2 +- audio/tests/benchmark/mfcc.py | 2 +- audio/tests/features/test_librosa.py | 8 ++++---- audio/tests/features/test_spectrogram.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/tests/benchmark/log_melspectrogram.py b/audio/tests/benchmark/log_melspectrogram.py index 79b5406d2..1d03c1df3 100644 --- a/audio/tests/benchmark/log_melspectrogram.py +++ b/audio/tests/benchmark/log_melspectrogram.py @@ -55,7 +55,7 @@ def enable_gpu_device(): paddle.set_device('gpu') -log_mel_extractor = paddleaudio.features.LogMelSpectrogram( +log_mel_extractor = paddle.audio.features.LogMelSpectrogram( **mel_conf, f_min=0.0, top_db=80.0, dtype=waveform_tensor.dtype) diff --git a/audio/tests/benchmark/melspectrogram.py b/audio/tests/benchmark/melspectrogram.py index 34e65bcb5..28c4ac806 100644 --- a/audio/tests/benchmark/melspectrogram.py +++ b/audio/tests/benchmark/melspectrogram.py @@ -55,7 +55,7 @@ def enable_gpu_device(): paddle.set_device('gpu') -mel_extractor = paddleaudio.features.MelSpectrogram( +mel_extractor = paddle.audio.features.MelSpectrogram( **mel_conf, f_min=0.0, dtype=waveform_tensor.dtype) diff --git a/audio/tests/benchmark/mfcc.py b/audio/tests/benchmark/mfcc.py index 4173c4bec..544a5371b 100644 --- a/audio/tests/benchmark/mfcc.py +++ b/audio/tests/benchmark/mfcc.py @@ -64,7 +64,7 @@ def enable_gpu_device(): paddle.set_device('gpu') -mfcc_extractor = paddleaudio.features.MFCC( +mfcc_extractor = paddle.audio.features.MFCC( **mfcc_conf, f_min=0.0, dtype=waveform_tensor.dtype) diff --git a/audio/tests/features/test_librosa.py b/audio/tests/features/test_librosa.py index 19d094b4b..8cda25b19 100644 --- a/audio/tests/features/test_librosa.py +++ b/audio/tests/features/test_librosa.py @@ -169,7 +169,7 @@ class TestLibrosa(FeatTest): # paddleaudio.features.layer x = paddle.to_tensor( self.waveform, dtype=paddle.float64).unsqueeze(0) # Add batch dim. - feature_extractor = paddleaudio.features.MelSpectrogram( + feature_extractor = paddle.audio.features.MelSpectrogram( sr=self.sr, n_fft=self.n_fft, hop_length=self.hop_length, @@ -210,7 +210,7 @@ class TestLibrosa(FeatTest): # paddleaudio.features.layer x = paddle.to_tensor( self.waveform, dtype=paddle.float64).unsqueeze(0) # Add batch dim. - feature_extractor = paddleaudio.features.LogMelSpectrogram( + feature_extractor = paddle.audio.features.LogMelSpectrogram( sr=self.sr, n_fft=self.n_fft, hop_length=self.hop_length, @@ -257,10 +257,10 @@ class TestLibrosa(FeatTest): fmin=self.fmin, top_db=self.top_db) - # paddleaudio.features.layer + # paddle.audio.features.layer x = paddle.to_tensor( self.waveform, dtype=paddle.float64).unsqueeze(0) # Add batch dim. - feature_extractor = paddleaudio.features.MFCC( + feature_extractor = paddle.audio.features.MFCC( sr=self.sr, n_mfcc=self.n_mfcc, n_fft=self.n_fft, diff --git a/audio/tests/features/test_spectrogram.py b/audio/tests/features/test_spectrogram.py index 1774fe619..5fe5afee1 100644 --- a/audio/tests/features/test_spectrogram.py +++ b/audio/tests/features/test_spectrogram.py @@ -31,7 +31,7 @@ class TestSpectrogram(FeatTest): ps_res = ps_spect(self.waveform.T).squeeze(1).T # Magnitude x = paddle.to_tensor(self.waveform) - pa_spect = paddleaudio.features.Spectrogram( + pa_spect = paddle.audio.features.Spectrogram( self.n_fft, self.hop_length, power=1.0) pa_res = pa_spect(x).squeeze(0).numpy()