From b671f2b6e944242b66c96e3dd40f38da1aacce05 Mon Sep 17 00:00:00 2001 From: drryanhuang Date: Mon, 13 Jan 2025 03:49:50 +0000 Subject: [PATCH] change path --- audio/audiotools/data/datasets.py | 14 +++++++------- audio/audiotools/data/preprocess.py | 2 +- audio/audiotools/post.py | 4 ++-- audio/tests/audiotools/core/test_audio_signal.py | 8 ++++---- audio/tests/audiotools/core/test_bands.py | 6 ++++-- audio/tests/audiotools/core/test_display.py | 5 ++--- audio/tests/audiotools/core/test_dsp.py | 6 +++--- audio/tests/audiotools/core/test_effects.py | 4 ++-- audio/tests/audiotools/core/test_fftconv.py | 5 +++-- audio/tests/audiotools/core/test_grad.py | 4 ++-- audio/tests/audiotools/core/test_highpass.py | 5 +++-- audio/tests/audiotools/core/test_loudness.py | 10 +++++----- audio/tests/audiotools/core/test_lowpass.py | 7 +++++-- audio/tests/audiotools/core/test_util.py | 5 ++--- audio/tests/audiotools/data/test_datasets.py | 7 +++---- audio/tests/audiotools/data/test_preprocess.py | 8 ++++---- audio/tests/audiotools/data/test_transforms.py | 11 +++++------ audio/tests/audiotools/ml/test_decorators.py | 10 +++++----- audio/tests/audiotools/ml/test_model.py | 6 +++--- audio/tests/audiotools/test_post.py | 7 +++---- tests/unit/cli/test_cli.sh | 1 - 21 files changed, 68 insertions(+), 67 deletions(-) diff --git a/audio/audiotools/data/datasets.py b/audio/audiotools/data/datasets.py index cabf2953b..37daaef05 100644 --- a/audio/audiotools/data/datasets.py +++ b/audio/audiotools/data/datasets.py @@ -202,9 +202,9 @@ class AudioDataset: Examples -------- - >>> from audiotools.data.datasets import AudioLoader - >>> from audiotools.data.datasets import AudioDataset - >>> from audiotools import transforms as tfm + >>> from audio.audiotools.data.datasets import AudioLoader + >>> from audio.audiotools.data.datasets import AudioDataset + >>> from audio.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: - >>> import audiotools as at + >>> from audio import audiotools as at >>> from pathlib import Path - >>> from audiotools import transforms as tfm + >>> from audio.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: - >>> import audiotools as at + >>> from audio import audiotools as at >>> from pathlib import Path - >>> from audiotools import transforms as tfm + >>> from audio.audiotools import transforms as tfm >>> import numpy as np >>> import torch >>> import glob diff --git a/audio/audiotools/data/preprocess.py b/audio/audiotools/data/preprocess.py index 0fce34f07..1f609c00b 100644 --- a/audio/audiotools/data/preprocess.py +++ b/audio/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: - >>> import audiotools + >>> from audio import audiotools >>> directory = ... >>> audio_files = audiotools.util.find_audio(directory) >>> output_path = "train.csv" diff --git a/audio/audiotools/post.py b/audio/audiotools/post.py index 31aae90cf..9c3a40aa3 100644 --- a/audio/audiotools/post.py +++ b/audio/audiotools/post.py @@ -9,7 +9,7 @@ from pathlib import Path from typing import TYPE_CHECKING if TYPE_CHECKING: - from audiotools import AudioSignal + from audio.audiotools import AudioSignal import markdown2 as md import matplotlib.pyplot as plt import paddle @@ -50,7 +50,7 @@ def audio_table( >>> audiotools.post.audio_zip(audio_dict) """ - from audiotools import AudioSignal + from audio.audiotools import AudioSignal output = [] columns = None diff --git a/audio/tests/audiotools/core/test_audio_signal.py b/audio/tests/audiotools/core/test_audio_signal.py index 08cd62932..ede3d9ec7 100644 --- a/audio/tests/audiotools/core/test_audio_signal.py +++ b/audio/tests/audiotools/core/test_audio_signal.py @@ -11,10 +11,10 @@ import numpy as np import paddle import pytest import rich -sys.path.append("../..") -import audiotools -from audiotools import AudioSignal -from audiotools import util + +from audio import audiotools +from audio.audiotools import AudioSignal +from audio.audiotools import util def test_io(): diff --git a/audio/tests/audiotools/core/test_bands.py b/audio/tests/audiotools/core/test_bands.py index e055b19c4..0e7a399da 100644 --- a/audio/tests/audiotools/core/test_bands.py +++ b/audio/tests/audiotools/core/test_bands.py @@ -7,8 +7,10 @@ import sys import unittest import paddle -sys.path.append("../..") -from audiotools.core import pure_tone, SplitBands, split_bands + +from audio.audiotools.core import pure_tone +from audio.audiotools.core import split_bands +from audio.audiotools.core import SplitBands def delta(a, b, ref, fraction=0.9): diff --git a/audio/tests/audiotools/core/test_display.py b/audio/tests/audiotools/core/test_display.py index d36c28866..a73b72b42 100644 --- a/audio/tests/audiotools/core/test_display.py +++ b/audio/tests/audiotools/core/test_display.py @@ -6,11 +6,10 @@ import sys from pathlib import Path import numpy as np -sys.path.append("../..") - -from audiotools import AudioSignal from visualdl import LogWriter +from audio.audiotools import AudioSignal + def test_specshow(): array = np.zeros((1, 16000)) diff --git a/audio/tests/audiotools/core/test_dsp.py b/audio/tests/audiotools/core/test_dsp.py index 547b0dc53..b6db1baf7 100644 --- a/audio/tests/audiotools/core/test_dsp.py +++ b/audio/tests/audiotools/core/test_dsp.py @@ -7,9 +7,9 @@ import sys import numpy as np import paddle import pytest -sys.path.append("../..") -from audiotools import AudioSignal -from audiotools.core.util import sample_from_dist + +from audio.audiotools import AudioSignal +from audio.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/audio/tests/audiotools/core/test_effects.py index ffe3c2a85..9dba99481 100644 --- a/audio/tests/audiotools/core/test_effects.py +++ b/audio/tests/audiotools/core/test_effects.py @@ -7,8 +7,8 @@ import sys import numpy as np import paddle import pytest -sys.path.append("../..") -from audiotools import AudioSignal + +from audio.audiotools import AudioSignal def test_normalize(): diff --git a/audio/tests/audiotools/core/test_fftconv.py b/audio/tests/audiotools/core/test_fftconv.py index 908e077e3..c3430dae5 100644 --- a/audio/tests/audiotools/core/test_fftconv.py +++ b/audio/tests/audiotools/core/test_fftconv.py @@ -8,8 +8,9 @@ import unittest import paddle import paddle.nn.functional as F -sys.path.append("../..") -from audiotools.core import fft_conv1d, FFTConv1D + +from audio.audiotools.core import fft_conv1d +from audio.audiotools.core import FFTConv1D TOLERANCE = 1e-4 # as relative delta in percentage diff --git a/audio/tests/audiotools/core/test_grad.py b/audio/tests/audiotools/core/test_grad.py index 95a88078d..e90320b68 100644 --- a/audio/tests/audiotools/core/test_grad.py +++ b/audio/tests/audiotools/core/test_grad.py @@ -8,8 +8,8 @@ from typing import Callable import numpy as np import paddle import pytest -sys.path.append("../..") -from audiotools import AudioSignal + +from audio.audiotools import AudioSignal def test_audio_grad(): diff --git a/audio/tests/audiotools/core/test_highpass.py b/audio/tests/audiotools/core/test_highpass.py index 3da18b449..0959474b5 100644 --- a/audio/tests/audiotools/core/test_highpass.py +++ b/audio/tests/audiotools/core/test_highpass.py @@ -8,8 +8,9 @@ import sys import unittest import paddle -sys.path.append("../..") -from audiotools.core import highpass_filter, highpass_filters + +from audio.audiotools.core import highpass_filter +from audio.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/audio/tests/audiotools/core/test_loudness.py index 6b74509d7..a4f7cc4f3 100644 --- a/audio/tests/audiotools/core/test_loudness.py +++ b/audio/tests/audiotools/core/test_loudness.py @@ -7,11 +7,11 @@ import sys import numpy as np import pyloudnorm import soundfile as sf -sys.path.append("../..") -from audiotools import AudioSignal -from audiotools import datasets -from audiotools import Meter -from audiotools import transforms + +from audio.audiotools import AudioSignal +from audio.audiotools import datasets +from audio.audiotools import Meter +from audio.audiotools import transforms ATOL = 1e-1 diff --git a/audio/tests/audiotools/core/test_lowpass.py b/audio/tests/audiotools/core/test_lowpass.py index e81060e4f..5b00e757f 100644 --- a/audio/tests/audiotools/core/test_lowpass.py +++ b/audio/tests/audiotools/core/test_lowpass.py @@ -9,8 +9,11 @@ import unittest import numpy as np import paddle -sys.path.append("../..") -from audiotools.core import LowPassFilter, LowPassFilters, lowpass_filter, resample_frac + +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 def pure_tone(freq: float, sr: float=128, dur: float=4, device=None): diff --git a/audio/tests/audiotools/core/test_util.py b/audio/tests/audiotools/core/test_util.py index 2567bd9b7..7516dce47 100644 --- a/audio/tests/audiotools/core/test_util.py +++ b/audio/tests/audiotools/core/test_util.py @@ -11,9 +11,8 @@ import numpy as np import paddle import pytest -sys.path.append("../..") -from audiotools import util -from audiotools.core.audio_signal import AudioSignal +from audio.audiotools import util +from audio.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/audio/tests/audiotools/data/test_datasets.py index 5c6bef11a..f26267ca0 100644 --- a/audio/tests/audiotools/data/test_datasets.py +++ b/audio/tests/audiotools/data/test_datasets.py @@ -7,12 +7,11 @@ import tempfile from pathlib import Path import numpy as np +import paddle import pytest -sys.path.append("../..") -import paddle -import audiotools -from audiotools.data import transforms as tfm +from audio import audiotools +from audio.audiotools.data import transforms as tfm def test_align_lists(): diff --git a/audio/tests/audiotools/data/test_preprocess.py b/audio/tests/audiotools/data/test_preprocess.py index 35295a478..5dbb0daa4 100644 --- a/audio/tests/audiotools/data/test_preprocess.py +++ b/audio/tests/audiotools/data/test_preprocess.py @@ -7,10 +7,10 @@ import tempfile from pathlib import Path import paddle -sys.path.append("../..") -from audiotools.core.util import find_audio -from audiotools.core.util import read_sources -from audiotools.data import preprocess + +from audio.audiotools.core.util import find_audio +from audio.audiotools.core.util import read_sources +from audio.audiotools.data import preprocess def test_create_csv(): diff --git a/audio/tests/audiotools/data/test_transforms.py b/audio/tests/audiotools/data/test_transforms.py index 67e5deac4..0175f8ff3 100644 --- a/audio/tests/audiotools/data/test_transforms.py +++ b/audio/tests/audiotools/data/test_transforms.py @@ -11,12 +11,11 @@ import numpy as np import paddle import pytest -sys.path.append("../..") -import audiotools -from audiotools import AudioSignal -from audiotools import util -from audiotools.data import transforms as tfm -from audiotools.data.datasets import AudioDataset +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.vector.training.seeding import seed_everything non_deterministic_transforms = ["TimeNoise", "FrequencyNoise"] diff --git a/audio/tests/audiotools/ml/test_decorators.py b/audio/tests/audiotools/ml/test_decorators.py index 8b24ac4bd..555f3b345 100644 --- a/audio/tests/audiotools/ml/test_decorators.py +++ b/audio/tests/audiotools/ml/test_decorators.py @@ -4,14 +4,14 @@ # Modified from audiotools(https://github.com/descriptinc/audiotools/blob/master/tests/ml/test_decorators.py) import sys import time -sys.path.append("../..") + import paddle from visualdl import LogWriter -from audiotools.ml.decorators import timer -from audiotools.ml.decorators import Tracker -from audiotools.ml.decorators import when -from audiotools import util +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 def test_all_decorators(): diff --git a/audio/tests/audiotools/ml/test_model.py b/audio/tests/audiotools/ml/test_model.py index 82e3d7cf6..5b1ac7f9d 100644 --- a/audio/tests/audiotools/ml/test_model.py +++ b/audio/tests/audiotools/ml/test_model.py @@ -7,9 +7,9 @@ import tempfile import paddle from paddle import nn -sys.path.append("../..") -from audiotools import ml -from audiotools import util + +from audio.audiotools import ml +from audio.audiotools import util from paddlespeech.vector.training.seeding import seed_everything SEED = 0 diff --git a/audio/tests/audiotools/test_post.py b/audio/tests/audiotools/test_post.py index fcd281694..def831ec2 100644 --- a/audio/tests/audiotools/test_post.py +++ b/audio/tests/audiotools/test_post.py @@ -5,10 +5,9 @@ import sys from pathlib import Path -sys.path.append("../..") -from audiotools import AudioSignal -from audiotools import post -from audiotools import transforms +from audio.audiotools import AudioSignal +from audio.audiotools import post +from audio.audiotools import transforms def test_audio_table(): diff --git a/tests/unit/cli/test_cli.sh b/tests/unit/cli/test_cli.sh index be287ed6c..3903e6597 100755 --- a/tests/unit/cli/test_cli.sh +++ b/tests/unit/cli/test_cli.sh @@ -115,4 +115,3 @@ paddlespeech whisper --task translate --input ./zh.wav paddlespeech whisper --lang en --size base --task transcribe --input ./en.wav echo -e "\033[32mTest success !!!\033[0m" -