From f2ca05e830f292e6494b94c434757b2c797dc639 Mon Sep 17 00:00:00 2001 From: drryanhuang Date: Tue, 26 Nov 2024 07:15:54 +0000 Subject: [PATCH] fix dir --- audio/audiotools/__init__.py | 10 ++++++++++ audio/audiotools/core/__init__.py | 4 ++++ audio/audiotools/{ => core}/audio_signal.py | 4 ++-- audio/audiotools/{ => core}/resample.py | 0 audio/audiotools/{ => core}/util.py | 0 audio/audiotools/data/__init__.py | 4 ++-- audio/audiotools/data/preprocess.py | 4 ++-- audio/audiotools/data/transforms.py | 6 ++---- audio/audiotools/metrics/__init__.py | 6 ++++++ audio/audiotools/{ => metrics}/quality.py | 0 audio/audiotools/ml/__init__.py | 5 +++++ audio/audiotools/{ => ml}/accelerator.py | 0 audio/audiotools/{ => ml}/basemodel.py | 0 audio/audiotools/{ => ml}/decorators.py | 0 14 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 audio/audiotools/__init__.py create mode 100644 audio/audiotools/core/__init__.py rename audio/audiotools/{ => core}/audio_signal.py (99%) rename audio/audiotools/{ => core}/resample.py (100%) rename audio/audiotools/{ => core}/util.py (100%) create mode 100644 audio/audiotools/metrics/__init__.py rename audio/audiotools/{ => metrics}/quality.py (100%) create mode 100644 audio/audiotools/ml/__init__.py rename audio/audiotools/{ => ml}/accelerator.py (100%) rename audio/audiotools/{ => ml}/basemodel.py (100%) rename audio/audiotools/{ => ml}/decorators.py (100%) diff --git a/audio/audiotools/__init__.py b/audio/audiotools/__init__.py new file mode 100644 index 000000000..53235f4a6 --- /dev/null +++ b/audio/audiotools/__init__.py @@ -0,0 +1,10 @@ +__version__ = "0.0.1" +from .core import AudioSignal +from .core import STFTParams +# from .core import Meter +from .core import util +from . import metrics +from . import data +from . import ml +from .data import datasets +from .data import transforms \ No newline at end of file diff --git a/audio/audiotools/core/__init__.py b/audio/audiotools/core/__init__.py new file mode 100644 index 000000000..ecd2d076a --- /dev/null +++ b/audio/audiotools/core/__init__.py @@ -0,0 +1,4 @@ +from . import util +from .audio_signal import AudioSignal +from .audio_signal import STFTParams +from .loudness import Meter \ No newline at end of file diff --git a/audio/audiotools/audio_signal.py b/audio/audiotools/core/audio_signal.py similarity index 99% rename from audio/audiotools/audio_signal.py rename to audio/audiotools/core/audio_signal.py index 051e0d5d6..64435242b 100644 --- a/audio/audiotools/audio_signal.py +++ b/audio/audiotools/core/audio_signal.py @@ -14,8 +14,8 @@ import librosa import numpy as np import paddle import soundfile -import util -from resample import resample_frac +from . import util +from .resample import resample_frac # from .display import DisplayMixin # from .dsp import DSPMixin diff --git a/audio/audiotools/resample.py b/audio/audiotools/core/resample.py similarity index 100% rename from audio/audiotools/resample.py rename to audio/audiotools/core/resample.py diff --git a/audio/audiotools/util.py b/audio/audiotools/core/util.py similarity index 100% rename from audio/audiotools/util.py rename to audio/audiotools/core/util.py diff --git a/audio/audiotools/data/__init__.py b/audio/audiotools/data/__init__.py index 5265384bd..aead269f2 100644 --- a/audio/audiotools/data/__init__.py +++ b/audio/audiotools/data/__init__.py @@ -1,3 +1,3 @@ -# from . import datasets +from . import datasets from . import preprocess -# from . import transforms +from . import transforms diff --git a/audio/audiotools/data/preprocess.py b/audio/audiotools/data/preprocess.py index 47de4352b..519bff7cb 100644 --- a/audio/audiotools/data/preprocess.py +++ b/audio/audiotools/data/preprocess.py @@ -2,9 +2,9 @@ import csv import os from pathlib import Path -from audio_signal import AudioSignal + from tqdm import tqdm -# from ..core import AudioSignal +from ..core import AudioSignal def create_csv(audio_files: list, diff --git a/audio/audiotools/data/transforms.py b/audio/audiotools/data/transforms.py index 9e98d8400..fffc66e89 100644 --- a/audio/audiotools/data/transforms.py +++ b/audio/audiotools/data/transforms.py @@ -11,10 +11,8 @@ from flatten_dict import unflatten from numpy.random import RandomState # from .. import ml -# from ..core import AudioSignal -# from ..core import util -from audio_signal import AudioSignal -import util +from ..core import AudioSignal +from ..core import util from .datasets import AudioLoader tt = paddle.to_tensor diff --git a/audio/audiotools/metrics/__init__.py b/audio/audiotools/metrics/__init__.py new file mode 100644 index 000000000..615f2b02e --- /dev/null +++ b/audio/audiotools/metrics/__init__.py @@ -0,0 +1,6 @@ +""" +Functions for comparing AudioSignal objects to one another. +""" # fmt: skip +# from . import distance +from . import quality +# from . import spectral \ No newline at end of file diff --git a/audio/audiotools/quality.py b/audio/audiotools/metrics/quality.py similarity index 100% rename from audio/audiotools/quality.py rename to audio/audiotools/metrics/quality.py diff --git a/audio/audiotools/ml/__init__.py b/audio/audiotools/ml/__init__.py new file mode 100644 index 000000000..24309429d --- /dev/null +++ b/audio/audiotools/ml/__init__.py @@ -0,0 +1,5 @@ +from . import decorators +# from . import layers +from .accelerator import Accelerator +# from .experiment import Experiment +from .basemodel import BaseModel \ No newline at end of file diff --git a/audio/audiotools/accelerator.py b/audio/audiotools/ml/accelerator.py similarity index 100% rename from audio/audiotools/accelerator.py rename to audio/audiotools/ml/accelerator.py diff --git a/audio/audiotools/basemodel.py b/audio/audiotools/ml/basemodel.py similarity index 100% rename from audio/audiotools/basemodel.py rename to audio/audiotools/ml/basemodel.py diff --git a/audio/audiotools/decorators.py b/audio/audiotools/ml/decorators.py similarity index 100% rename from audio/audiotools/decorators.py rename to audio/audiotools/ml/decorators.py