diff --git a/audio/audiotools/README.md b/paddlespeech/audiotools/README.md similarity index 100% rename from audio/audiotools/README.md rename to paddlespeech/audiotools/README.md diff --git a/audio/audiotools/__init__.py b/paddlespeech/audiotools/__init__.py similarity index 100% rename from audio/audiotools/__init__.py rename to paddlespeech/audiotools/__init__.py diff --git a/audio/audiotools/core/__init__.py b/paddlespeech/audiotools/core/__init__.py similarity index 100% rename from audio/audiotools/core/__init__.py rename to paddlespeech/audiotools/core/__init__.py diff --git a/audio/audiotools/core/_julius.py b/paddlespeech/audiotools/core/_julius.py similarity index 100% rename from audio/audiotools/core/_julius.py rename to paddlespeech/audiotools/core/_julius.py diff --git a/audio/audiotools/core/audio_signal.py b/paddlespeech/audiotools/core/audio_signal.py similarity index 100% rename from audio/audiotools/core/audio_signal.py rename to paddlespeech/audiotools/core/audio_signal.py diff --git a/audio/audiotools/core/display.py b/paddlespeech/audiotools/core/display.py similarity index 100% rename from audio/audiotools/core/display.py rename to paddlespeech/audiotools/core/display.py diff --git a/audio/audiotools/core/dsp.py b/paddlespeech/audiotools/core/dsp.py similarity index 100% rename from audio/audiotools/core/dsp.py rename to paddlespeech/audiotools/core/dsp.py diff --git a/audio/audiotools/core/effects.py b/paddlespeech/audiotools/core/effects.py similarity index 100% rename from audio/audiotools/core/effects.py rename to paddlespeech/audiotools/core/effects.py diff --git a/audio/audiotools/core/ffmpeg.py b/paddlespeech/audiotools/core/ffmpeg.py similarity index 100% rename from audio/audiotools/core/ffmpeg.py rename to paddlespeech/audiotools/core/ffmpeg.py diff --git a/audio/audiotools/core/loudness.py b/paddlespeech/audiotools/core/loudness.py similarity index 100% rename from audio/audiotools/core/loudness.py rename to paddlespeech/audiotools/core/loudness.py diff --git a/audio/audiotools/core/util.py b/paddlespeech/audiotools/core/util.py similarity index 99% rename from audio/audiotools/core/util.py rename to paddlespeech/audiotools/core/util.py index 0bbcf46a5..6da927a6f 100644 --- a/audio/audiotools/core/util.py +++ b/paddlespeech/audiotools/core/util.py @@ -734,8 +734,8 @@ def default_collate(batch, if not all(len(elem) == elem_size for elem in it): raise RuntimeError( "each element in list of batch should be of equal size") - transposed = list(zip( - *batch)) # It may be accessed twice, so we use a list. + transposed = list( + zip(*batch)) # It may be accessed twice, so we use a list. if isinstance(elem, tuple): return [ diff --git a/audio/audiotools/data/__init__.py b/paddlespeech/audiotools/data/__init__.py similarity index 100% rename from audio/audiotools/data/__init__.py rename to paddlespeech/audiotools/data/__init__.py diff --git a/audio/audiotools/data/datasets.py b/paddlespeech/audiotools/data/datasets.py similarity index 97% rename from audio/audiotools/data/datasets.py rename to paddlespeech/audiotools/data/datasets.py index 37daaef05..24558ce17 100644 --- a/audio/audiotools/data/datasets.py +++ b/paddlespeech/audiotools/data/datasets.py @@ -202,9 +202,9 @@ class AudioDataset: Examples -------- - >>> from audio.audiotools.data.datasets import AudioLoader - >>> from audio.audiotools.data.datasets import AudioDataset - >>> from audio.audiotools import transforms as tfm + >>> from paddlespeech.audiotools.data.datasets import AudioLoader + >>> from paddlespeech.audiotools.data.datasets import AudioDataset + >>> from paddlespeech.audiotools import transforms as tfm >>> import numpy as np >>> >>> loaders = [ @@ -237,9 +237,9 @@ class AudioDataset: Below is an example of how one could load MUSDB multitrack data: - >>> from audio import audiotools as at + >>> from paddlespeech import audiotools as at >>> from pathlib import Path - >>> from audio.audiotools import transforms as tfm + >>> from paddlespeech.audiotools import transforms as tfm >>> import numpy as np >>> import torch >>> @@ -296,9 +296,9 @@ class AudioDataset: Similarly, here's example code for loading Slakh data: - >>> from audio import audiotools as at + >>> from paddlespeech import audiotools as at >>> from pathlib import Path - >>> from audio.audiotools import transforms as tfm + >>> from paddlespeech.audiotools import transforms as tfm >>> import numpy as np >>> import torch >>> import glob diff --git a/audio/audiotools/data/preprocess.py b/paddlespeech/audiotools/data/preprocess.py similarity index 98% rename from audio/audiotools/data/preprocess.py rename to paddlespeech/audiotools/data/preprocess.py index 1f609c00b..703942791 100644 --- a/audio/audiotools/data/preprocess.py +++ b/paddlespeech/audiotools/data/preprocess.py @@ -37,7 +37,7 @@ def create_csv(audio_files: list, You can produce a CSV file from a directory of audio files via: - >>> from audio import audiotools + >>> from paddlespeech import audiotools >>> directory = ... >>> audio_files = audiotools.util.find_audio(directory) >>> output_path = "train.csv" diff --git a/audio/audiotools/data/transforms.py b/paddlespeech/audiotools/data/transforms.py similarity index 100% rename from audio/audiotools/data/transforms.py rename to paddlespeech/audiotools/data/transforms.py diff --git a/audio/audiotools/metrics/__init__.py b/paddlespeech/audiotools/metrics/__init__.py similarity index 100% rename from audio/audiotools/metrics/__init__.py rename to paddlespeech/audiotools/metrics/__init__.py diff --git a/audio/audiotools/metrics/quality.py b/paddlespeech/audiotools/metrics/quality.py similarity index 100% rename from audio/audiotools/metrics/quality.py rename to paddlespeech/audiotools/metrics/quality.py diff --git a/audio/audiotools/ml/__init__.py b/paddlespeech/audiotools/ml/__init__.py similarity index 100% rename from audio/audiotools/ml/__init__.py rename to paddlespeech/audiotools/ml/__init__.py diff --git a/audio/audiotools/ml/accelerator.py b/paddlespeech/audiotools/ml/accelerator.py similarity index 100% rename from audio/audiotools/ml/accelerator.py rename to paddlespeech/audiotools/ml/accelerator.py diff --git a/audio/audiotools/ml/basemodel.py b/paddlespeech/audiotools/ml/basemodel.py similarity index 100% rename from audio/audiotools/ml/basemodel.py rename to paddlespeech/audiotools/ml/basemodel.py diff --git a/audio/audiotools/ml/decorators.py b/paddlespeech/audiotools/ml/decorators.py similarity index 100% rename from audio/audiotools/ml/decorators.py rename to paddlespeech/audiotools/ml/decorators.py diff --git a/audio/audiotools/post.py b/paddlespeech/audiotools/post.py similarity index 97% rename from audio/audiotools/post.py rename to paddlespeech/audiotools/post.py index f5ec208ed..a4cc51ea1 100644 --- a/audio/audiotools/post.py +++ b/paddlespeech/audiotools/post.py @@ -6,7 +6,7 @@ import typing import paddle -from audio.audiotools.core import AudioSignal +from paddlespeech.audiotools.core import AudioSignal def audio_table( diff --git a/audio/audiotools/requirements.txt b/paddlespeech/audiotools/requirements.txt similarity index 78% rename from audio/audiotools/requirements.txt rename to paddlespeech/audiotools/requirements.txt index 57e228559..0a018002e 100644 --- a/audio/audiotools/requirements.txt +++ b/paddlespeech/audiotools/requirements.txt @@ -2,5 +2,4 @@ ffmpeg-python ffmpy flatten_dict pyloudnorm -pytest -rich +rich \ No newline at end of file diff --git a/audio/tests/audiotools/core/test_audio_signal.py b/tests/unit/audiotools/core/test_audio_signal.py similarity index 99% rename from audio/tests/audiotools/core/test_audio_signal.py rename to tests/unit/audiotools/core/test_audio_signal.py index ede3d9ec7..0e82ae9d5 100644 --- a/audio/tests/audiotools/core/test_audio_signal.py +++ b/tests/unit/audiotools/core/test_audio_signal.py @@ -12,9 +12,9 @@ import paddle import pytest import rich -from audio import audiotools -from audio.audiotools import AudioSignal -from audio.audiotools import util +from paddlespeech import audiotools +from paddlespeech.audiotools import AudioSignal +from paddlespeech.audiotools import util def test_io(): diff --git a/audio/tests/audiotools/core/test_bands.py b/tests/unit/audiotools/core/test_bands.py similarity index 89% rename from audio/tests/audiotools/core/test_bands.py rename to tests/unit/audiotools/core/test_bands.py index 0e7a399da..773d40701 100644 --- a/audio/tests/audiotools/core/test_bands.py +++ b/tests/unit/audiotools/core/test_bands.py @@ -8,9 +8,9 @@ import unittest import paddle -from audio.audiotools.core import pure_tone -from audio.audiotools.core import split_bands -from audio.audiotools.core import SplitBands +from paddlespeech.audiotools.core import pure_tone +from paddlespeech.audiotools.core import split_bands +from paddlespeech.audiotools.core import SplitBands def delta(a, b, ref, fraction=0.9): diff --git a/audio/tests/audiotools/core/test_display.py b/tests/unit/audiotools/core/test_display.py similarity index 96% rename from audio/tests/audiotools/core/test_display.py rename to tests/unit/audiotools/core/test_display.py index a73b72b42..502a239f6 100644 --- a/audio/tests/audiotools/core/test_display.py +++ b/tests/unit/audiotools/core/test_display.py @@ -8,7 +8,7 @@ from pathlib import Path import numpy as np from visualdl import LogWriter -from audio.audiotools import AudioSignal +from paddlespeech.audiotools import AudioSignal def test_specshow(): diff --git a/audio/tests/audiotools/core/test_dsp.py b/tests/unit/audiotools/core/test_dsp.py similarity index 98% rename from audio/tests/audiotools/core/test_dsp.py rename to tests/unit/audiotools/core/test_dsp.py index b6db1baf7..77b556715 100644 --- a/audio/tests/audiotools/core/test_dsp.py +++ b/tests/unit/audiotools/core/test_dsp.py @@ -8,8 +8,8 @@ import numpy as np import paddle import pytest -from audio.audiotools import AudioSignal -from audio.audiotools.core.util import sample_from_dist +from paddlespeech.audiotools import AudioSignal +from paddlespeech.audiotools.core.util import sample_from_dist @pytest.mark.parametrize("window_duration", [0.1, 0.25, 0.5, 1.0]) diff --git a/audio/tests/audiotools/core/test_effects.py b/tests/unit/audiotools/core/test_effects.py similarity index 99% rename from audio/tests/audiotools/core/test_effects.py rename to tests/unit/audiotools/core/test_effects.py index 9dba99481..f900d9e56 100644 --- a/audio/tests/audiotools/core/test_effects.py +++ b/tests/unit/audiotools/core/test_effects.py @@ -8,7 +8,7 @@ import numpy as np import paddle import pytest -from audio.audiotools import AudioSignal +from paddlespeech.audiotools import AudioSignal def test_normalize(): diff --git a/audio/tests/audiotools/core/test_fftconv.py b/tests/unit/audiotools/core/test_fftconv.py similarity index 96% rename from audio/tests/audiotools/core/test_fftconv.py rename to tests/unit/audiotools/core/test_fftconv.py index c3430dae5..a30ccd6ab 100644 --- a/audio/tests/audiotools/core/test_fftconv.py +++ b/tests/unit/audiotools/core/test_fftconv.py @@ -9,8 +9,8 @@ import unittest import paddle import paddle.nn.functional as F -from audio.audiotools.core import fft_conv1d -from audio.audiotools.core import FFTConv1D +from paddlespeech.audiotools.core import fft_conv1d +from paddlespeech.audiotools.core import FFTConv1D TOLERANCE = 1e-4 # as relative delta in percentage diff --git a/audio/tests/audiotools/core/test_grad.py b/tests/unit/audiotools/core/test_grad.py similarity index 99% rename from audio/tests/audiotools/core/test_grad.py rename to tests/unit/audiotools/core/test_grad.py index e90320b68..eeca9b6d0 100644 --- a/audio/tests/audiotools/core/test_grad.py +++ b/tests/unit/audiotools/core/test_grad.py @@ -9,7 +9,7 @@ import numpy as np import paddle import pytest -from audio.audiotools import AudioSignal +from paddlespeech.audiotools import AudioSignal def test_audio_grad(): diff --git a/audio/tests/audiotools/core/test_highpass.py b/tests/unit/audiotools/core/test_highpass.py similarity index 96% rename from audio/tests/audiotools/core/test_highpass.py rename to tests/unit/audiotools/core/test_highpass.py index 0959474b5..f69f8452a 100644 --- a/audio/tests/audiotools/core/test_highpass.py +++ b/tests/unit/audiotools/core/test_highpass.py @@ -9,8 +9,8 @@ import unittest import paddle -from audio.audiotools.core import highpass_filter -from audio.audiotools.core import highpass_filters +from paddlespeech.audiotools.core import highpass_filter +from paddlespeech.audiotools.core import highpass_filters def pure_tone(freq: float, sr: float=128, dur: float=4, device=None): diff --git a/audio/tests/audiotools/core/test_loudness.py b/tests/unit/audiotools/core/test_loudness.py similarity index 97% rename from audio/tests/audiotools/core/test_loudness.py rename to tests/unit/audiotools/core/test_loudness.py index a4f7cc4f3..e14634a58 100644 --- a/audio/tests/audiotools/core/test_loudness.py +++ b/tests/unit/audiotools/core/test_loudness.py @@ -8,10 +8,10 @@ import numpy as np import pyloudnorm import soundfile as sf -from audio.audiotools import AudioSignal -from audio.audiotools import datasets -from audio.audiotools import Meter -from audio.audiotools import transforms +from paddlespeech.audiotools import AudioSignal +from paddlespeech.audiotools import datasets +from paddlespeech.audiotools import Meter +from paddlespeech.audiotools import transforms ATOL = 1e-1 diff --git a/audio/tests/audiotools/core/test_lowpass.py b/tests/unit/audiotools/core/test_lowpass.py similarity index 94% rename from audio/tests/audiotools/core/test_lowpass.py rename to tests/unit/audiotools/core/test_lowpass.py index 5b00e757f..cf929dcfb 100644 --- a/audio/tests/audiotools/core/test_lowpass.py +++ b/tests/unit/audiotools/core/test_lowpass.py @@ -10,10 +10,10 @@ import unittest import numpy as np import paddle -from audio.audiotools.core import lowpass_filter -from audio.audiotools.core import LowPassFilter -from audio.audiotools.core import LowPassFilters -from audio.audiotools.core import resample_frac +from paddlespeech.audiotools.core import lowpass_filter +from paddlespeech.audiotools.core import LowPassFilter +from paddlespeech.audiotools.core import LowPassFilters +from paddlespeech.audiotools.core import resample_frac def pure_tone(freq: float, sr: float=128, dur: float=4, device=None): diff --git a/audio/tests/audiotools/core/test_util.py b/tests/unit/audiotools/core/test_util.py similarity index 97% rename from audio/tests/audiotools/core/test_util.py rename to tests/unit/audiotools/core/test_util.py index 7516dce47..155686acd 100644 --- a/audio/tests/audiotools/core/test_util.py +++ b/tests/unit/audiotools/core/test_util.py @@ -11,8 +11,8 @@ import numpy as np import paddle import pytest -from audio.audiotools import util -from audio.audiotools.core.audio_signal import AudioSignal +from paddlespeech.audiotools import util +from paddlespeech.audiotools.core.audio_signal import AudioSignal from paddlespeech.vector.training.seeding import seed_everything diff --git a/audio/tests/audiotools/data/test_datasets.py b/tests/unit/audiotools/data/test_datasets.py similarity index 98% rename from audio/tests/audiotools/data/test_datasets.py rename to tests/unit/audiotools/data/test_datasets.py index f26267ca0..c6aca4d30 100644 --- a/audio/tests/audiotools/data/test_datasets.py +++ b/tests/unit/audiotools/data/test_datasets.py @@ -10,8 +10,8 @@ import numpy as np import paddle import pytest -from audio import audiotools -from audio.audiotools.data import transforms as tfm +from paddlespeech import audiotools +from paddlespeech.audiotools.data import transforms as tfm def test_align_lists(): diff --git a/audio/tests/audiotools/data/test_preprocess.py b/tests/unit/audiotools/data/test_preprocess.py similarity index 85% rename from audio/tests/audiotools/data/test_preprocess.py rename to tests/unit/audiotools/data/test_preprocess.py index 5dbb0daa4..ea850cad3 100644 --- a/audio/tests/audiotools/data/test_preprocess.py +++ b/tests/unit/audiotools/data/test_preprocess.py @@ -8,9 +8,9 @@ from pathlib import Path import paddle -from audio.audiotools.core.util import find_audio -from audio.audiotools.core.util import read_sources -from audio.audiotools.data import preprocess +from paddlespeech.audiotools.core.util import find_audio +from paddlespeech.audiotools.core.util import read_sources +from paddlespeech.audiotools.data import preprocess def test_create_csv(): diff --git a/audio/tests/audiotools/data/test_transforms.py b/tests/unit/audiotools/data/test_transforms.py similarity index 98% rename from audio/tests/audiotools/data/test_transforms.py rename to tests/unit/audiotools/data/test_transforms.py index 0175f8ff3..08c28691e 100644 --- a/audio/tests/audiotools/data/test_transforms.py +++ b/tests/unit/audiotools/data/test_transforms.py @@ -11,11 +11,11 @@ import numpy as np import paddle import pytest -from audio import audiotools -from audio.audiotools import AudioSignal -from audio.audiotools import util -from audio.audiotools.data import transforms as tfm -from audio.audiotools.data.datasets import AudioDataset +from paddlespeech import audiotools +from paddlespeech.audiotools import AudioSignal +from paddlespeech.audiotools import util +from paddlespeech.audiotools.data import transforms as tfm +from paddlespeech.audiotools.data.datasets import AudioDataset from paddlespeech.vector.training.seeding import seed_everything non_deterministic_transforms = ["TimeNoise", "FrequencyNoise"] diff --git a/audio/tests/audiotools/ml/test_decorators.py b/tests/unit/audiotools/ml/test_decorators.py similarity index 93% rename from audio/tests/audiotools/ml/test_decorators.py rename to tests/unit/audiotools/ml/test_decorators.py index 555f3b345..8deb2fac7 100644 --- a/audio/tests/audiotools/ml/test_decorators.py +++ b/tests/unit/audiotools/ml/test_decorators.py @@ -8,10 +8,10 @@ import time import paddle from visualdl import LogWriter -from audio.audiotools import util -from audio.audiotools.ml.decorators import timer -from audio.audiotools.ml.decorators import Tracker -from audio.audiotools.ml.decorators import when +from paddlespeech.audiotools import util +from paddlespeech.audiotools.ml.decorators import timer +from paddlespeech.audiotools.ml.decorators import Tracker +from paddlespeech.audiotools.ml.decorators import when def test_all_decorators(): diff --git a/audio/tests/audiotools/ml/test_model.py b/tests/unit/audiotools/ml/test_model.py similarity index 96% rename from audio/tests/audiotools/ml/test_model.py rename to tests/unit/audiotools/ml/test_model.py index 5b1ac7f9d..347899f75 100644 --- a/audio/tests/audiotools/ml/test_model.py +++ b/tests/unit/audiotools/ml/test_model.py @@ -8,10 +8,10 @@ import tempfile import paddle from paddle import nn -from audio.audiotools import ml -from audio.audiotools import util +from paddlespeech.audiotools import ml +from paddlespeech.audiotools import util from paddlespeech.vector.training.seeding import seed_everything -SEED = 0 +SEED = 1024 def seed_and_run(model, *args, **kwargs): diff --git a/audio/tests/audiotools/test_audiotools.sh b/tests/unit/audiotools/test_audiotools.sh similarity index 56% rename from audio/tests/audiotools/test_audiotools.sh rename to tests/unit/audiotools/test_audiotools.sh index 387059d51..3a0161900 100644 --- a/audio/tests/audiotools/test_audiotools.sh +++ b/tests/unit/audiotools/test_audiotools.sh @@ -1,5 +1,4 @@ -python -m pip install -r ../../audiotools/requirements.txt -export PYTHONPATH=$PYTHONPATH:$(realpath ../../..) # this is root path of `PaddleSpeech` +python -m pip install -r ../../../paddlespeech/audiotools/requirements.txt wget https://paddlespeech.bj.bcebos.com/PaddleAudio/audio_tools/audio.tar.gz wget https://paddlespeech.bj.bcebos.com/PaddleAudio/audio_tools/regression.tar.gz tar -zxvf audio.tar.gz diff --git a/audio/tests/audiotools/test_post.py b/tests/unit/audiotools/test_post.py similarity index 84% rename from audio/tests/audiotools/test_post.py rename to tests/unit/audiotools/test_post.py index def831ec2..2456e2d14 100644 --- a/audio/tests/audiotools/test_post.py +++ b/tests/unit/audiotools/test_post.py @@ -5,9 +5,9 @@ import sys from pathlib import Path -from audio.audiotools import AudioSignal -from audio.audiotools import post -from audio.audiotools import transforms +from paddlespeech.audiotools import AudioSignal +from paddlespeech.audiotools import post +from paddlespeech.audiotools import transforms def test_audio_table(): diff --git a/tests/unit/ci.sh b/tests/unit/ci.sh index ef21645b2..6beff0707 100644 --- a/tests/unit/ci.sh +++ b/tests/unit/ci.sh @@ -34,7 +34,7 @@ function main(){ echo "End server" echo "Start testing audiotools" - cd ${speech_ci_path}/../../audio/tests/audiotools + cd ${speech_ci_path}/audiotools bash test_audiotools.sh echo "End testing audiotools"