diff --git a/audio/tests/backends/soundfile/test_io.py b/audio/tests/backends/soundfile/test_io.py index 0f7580a40d386c048e88e6e3f75c6451917c9d68..9d092902da49e4651574201fa6d050d2a12b9c92 100644 --- a/audio/tests/backends/soundfile/test_io.py +++ b/audio/tests/backends/soundfile/test_io.py @@ -16,9 +16,9 @@ import os import unittest import numpy as np +import paddleaudio import soundfile as sf -import paddleaudio from ..base import BackendTest diff --git a/audio/tests/benchmark/log_melspectrogram.py b/audio/tests/benchmark/log_melspectrogram.py index 5230acd424e27b22dfc3e656410f5f74f5a1b2d0..9832aed4d1b80a4565efac8a551946feb7a7a117 100644 --- a/audio/tests/benchmark/log_melspectrogram.py +++ b/audio/tests/benchmark/log_melspectrogram.py @@ -17,11 +17,10 @@ import urllib.request import librosa import numpy as np import paddle +import paddleaudio import torch import torchaudio -import paddleaudio - wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav' if not os.path.isfile(os.path.basename(wav_url)): urllib.request.urlretrieve(wav_url, os.path.basename(wav_url)) diff --git a/audio/tests/benchmark/melspectrogram.py b/audio/tests/benchmark/melspectrogram.py index e0b79b45a71a83ee5791ab97a633018c1d377ee1..5fe3f2481820810a394350b56bdd3c315e08cb46 100644 --- a/audio/tests/benchmark/melspectrogram.py +++ b/audio/tests/benchmark/melspectrogram.py @@ -17,11 +17,10 @@ import urllib.request import librosa import numpy as np import paddle +import paddleaudio import torch import torchaudio -import paddleaudio - wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav' if not os.path.isfile(os.path.basename(wav_url)): urllib.request.urlretrieve(wav_url, os.path.basename(wav_url)) diff --git a/audio/tests/benchmark/mfcc.py b/audio/tests/benchmark/mfcc.py index 2572ff33dd1cd80ba41ac1f0e35ec1df5e04e757..c6a8c85f90905442a8c2ee19ac52b1f0727aa50a 100644 --- a/audio/tests/benchmark/mfcc.py +++ b/audio/tests/benchmark/mfcc.py @@ -17,11 +17,10 @@ import urllib.request import librosa import numpy as np import paddle +import paddleaudio import torch import torchaudio -import paddleaudio - wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav' if not os.path.isfile(os.path.basename(wav_url)): urllib.request.urlretrieve(wav_url, os.path.basename(wav_url)) diff --git a/audio/tests/features/base.py b/audio/tests/features/base.py index 725e1e2e70bdacca0e067e371dfb8e71130e0170..476f6b8eeb7f14247fa00fd0943741c2eca53e66 100644 --- a/audio/tests/features/base.py +++ b/audio/tests/features/base.py @@ -17,7 +17,6 @@ import urllib.request import numpy as np import paddle - from paddleaudio import load wav_url = 'https://paddlespeech.bj.bcebos.com/PaddleAudio/zh.wav' diff --git a/audio/tests/features/test_istft.py b/audio/tests/features/test_istft.py index 23371200b6209a300e1205d1db02d3f6542f473e..9cf8cdd65582c0300d59749db621155eebd3faee 100644 --- a/audio/tests/features/test_istft.py +++ b/audio/tests/features/test_istft.py @@ -15,9 +15,9 @@ import unittest import numpy as np import paddle +from paddleaudio.functional.window import get_window from .base import FeatTest -from paddleaudio.functional.window import get_window from paddlespeech.s2t.transform.spectrogram import IStft from paddlespeech.s2t.transform.spectrogram import Stft diff --git a/audio/tests/features/test_kaldi.py b/audio/tests/features/test_kaldi.py index 6e826aaa75b751127548cba4d600195ad7094d00..00a576f6f48ee71405f5942ff961ae8f6e8edf55 100644 --- a/audio/tests/features/test_kaldi.py +++ b/audio/tests/features/test_kaldi.py @@ -15,10 +15,10 @@ import unittest import numpy as np import paddle +import paddleaudio import torch import torchaudio -import paddleaudio from .base import FeatTest diff --git a/audio/tests/features/test_librosa.py b/audio/tests/features/test_librosa.py index cf0c98c7295d6a7c2cdc7739455900d28ec02ef4..a1d3e8400dbc62924b68a1519605231d5da70bd8 100644 --- a/audio/tests/features/test_librosa.py +++ b/audio/tests/features/test_librosa.py @@ -16,11 +16,11 @@ import unittest import librosa import numpy as np import paddle - import paddleaudio -from .base import FeatTest from paddleaudio.functional.window import get_window +from .base import FeatTest + class TestLibrosa(FeatTest): def initParmas(self): diff --git a/audio/tests/features/test_log_melspectrogram.py b/audio/tests/features/test_log_melspectrogram.py index 6bae2df3f564da16cb511541f8bbc714ad0b087e..0383c2b8b200a261cbb3e9a8a354f432e28e10a2 100644 --- a/audio/tests/features/test_log_melspectrogram.py +++ b/audio/tests/features/test_log_melspectrogram.py @@ -15,8 +15,8 @@ import unittest import numpy as np import paddle - import paddleaudio + from .base import FeatTest from paddlespeech.s2t.transform.spectrogram import LogMelSpectrogram diff --git a/audio/tests/features/test_spectrogram.py b/audio/tests/features/test_spectrogram.py index 50b21403b4fb8187587edae0222a09996b384aec..1774fe61975c4b4ae11b7ff2c9200a4d67499efe 100644 --- a/audio/tests/features/test_spectrogram.py +++ b/audio/tests/features/test_spectrogram.py @@ -15,8 +15,8 @@ import unittest import numpy as np import paddle - import paddleaudio + from .base import FeatTest from paddlespeech.s2t.transform.spectrogram import Spectrogram diff --git a/audio/tests/features/test_stft.py b/audio/tests/features/test_stft.py index c64b5ebe6b497b5d9c40af0c14d2785afa2e7504..58792ffe2477058958a4e31ed122263306e83388 100644 --- a/audio/tests/features/test_stft.py +++ b/audio/tests/features/test_stft.py @@ -15,9 +15,9 @@ import unittest import numpy as np import paddle +from paddleaudio.functional.window import get_window from .base import FeatTest -from paddleaudio.functional.window import get_window from paddlespeech.s2t.transform.spectrogram import Stft diff --git a/demos/audio_searching/src/vpr_search.py b/demos/audio_searching/src/vpr_search.py index 94974d0d8d28c4de6c4ff873c58aef7035198bef..2780dfb3bf2b8630bd1b2b5975f42d01056e1133 100644 --- a/demos/audio_searching/src/vpr_search.py +++ b/demos/audio_searching/src/vpr_search.py @@ -19,6 +19,7 @@ from fastapi import FastAPI from fastapi import File from fastapi import Form from fastapi import UploadFile +from logs import LOGGER from mysql_helpers import MySQLHelper from operations.count import do_count_vpr from operations.count import do_get @@ -31,8 +32,6 @@ from starlette.middleware.cors import CORSMiddleware from starlette.requests import Request from starlette.responses import FileResponse -from logs import LOGGER - app = FastAPI() app.add_middleware( CORSMiddleware, diff --git a/examples/voxceleb/sv0/local/data_prepare.py b/examples/voxceleb/sv0/local/data_prepare.py index 03d054004f0f5f98103a78b5becdc8f0a8bda357..b4486b6f00cb91957dd0b27dffbc56dfba086df5 100644 --- a/examples/voxceleb/sv0/local/data_prepare.py +++ b/examples/voxceleb/sv0/local/data_prepare.py @@ -14,9 +14,9 @@ import argparse import paddle +from paddleaudio.datasets.voxceleb import VoxCeleb from yacs.config import CfgNode -from paddleaudio.datasets.voxceleb import VoxCeleb from paddlespeech.s2t.utils.log import Log from paddlespeech.vector.io.augment import build_augment_pipeline from paddlespeech.vector.training.seeding import seed_everything diff --git a/examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py b/examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py index b25a9d49a19d4250210c92dce4afb85510c41991..0d0163f159e518d152bce3366a3cc187181e4364 100644 --- a/examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py +++ b/examples/voxceleb/sv0/local/make_rirs_noise_csv_dataset_from_json.py @@ -21,9 +21,9 @@ import os from typing import List import tqdm +from paddleaudio import load as load_audio from yacs.config import CfgNode -from paddleaudio import load as load_audio from paddlespeech.s2t.utils.log import Log from paddlespeech.vector.utils.vector_utils import get_chunks diff --git a/examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py b/examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py index 4e64c306712635801c21d252bba498f64cbb6f6e..ffd0d212ddda7e31eeaf171f28f5096aaee5ea06 100644 --- a/examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py +++ b/examples/voxceleb/sv0/local/make_vox_csv_dataset_from_json.py @@ -22,9 +22,9 @@ import os import random import tqdm +from paddleaudio import load as load_audio from yacs.config import CfgNode -from paddleaudio import load as load_audio from paddlespeech.s2t.utils.log import Log from paddlespeech.vector.utils.vector_utils import get_chunks diff --git a/paddlespeech/cli/cls/infer.py b/paddlespeech/cli/cls/infer.py index 1f637a8fee69179f0ca5a538ce9c360d1c6cc935..8b90f1244891d42e1c25038efa8bf83597832a3a 100644 --- a/paddlespeech/cli/cls/infer.py +++ b/paddlespeech/cli/cls/infer.py @@ -21,6 +21,8 @@ from typing import Union import numpy as np import paddle import yaml +from paddleaudio import load +from paddleaudio.features import LogMelSpectrogram from ..executor import BaseExecutor from ..log import logger @@ -28,8 +30,6 @@ from ..utils import cli_register from ..utils import stats_wrapper from .pretrained_models import model_alias from .pretrained_models import pretrained_models -from paddleaudio import load -from paddleaudio.features import LogMelSpectrogram from paddlespeech.s2t.utils.dynamic_import import dynamic_import __all__ = ['CLSExecutor'] diff --git a/paddlespeech/cli/utils.py b/paddlespeech/cli/utils.py index f7d64b9a95e296a57abcf6340d4e6581e3ccbbe6..8e094894c5dd61bbbe21365e0ea1ae3bcad12815 100644 --- a/paddlespeech/cli/utils.py +++ b/paddlespeech/cli/utils.py @@ -24,11 +24,11 @@ from typing import Any from typing import Dict import paddle +import paddleaudio import requests import yaml from paddle.framework import load -import paddleaudio from . import download from .entry import commands try: diff --git a/paddlespeech/cli/vector/infer.py b/paddlespeech/cli/vector/infer.py index 1dff6edb42d7e0519375156403d40180647b9b13..37e1939190fd73175d96c95309bfd7f4a2eb01a8 100644 --- a/paddlespeech/cli/vector/infer.py +++ b/paddlespeech/cli/vector/infer.py @@ -22,6 +22,8 @@ from typing import Union import paddle import soundfile +from paddleaudio.backends import load as load_audio +from paddleaudio.compliance.librosa import melspectrogram from yacs.config import CfgNode from ..executor import BaseExecutor @@ -30,8 +32,6 @@ from ..utils import cli_register from ..utils import stats_wrapper from .pretrained_models import model_alias from .pretrained_models import pretrained_models -from paddleaudio.backends import load as load_audio -from paddleaudio.compliance.librosa import melspectrogram from paddlespeech.s2t.utils.dynamic_import import dynamic_import from paddlespeech.vector.io.batch import feature_normalize from paddlespeech.vector.modules.sid_model import SpeakerIdetification diff --git a/paddlespeech/cls/exps/panns/deploy/predict.py b/paddlespeech/cls/exps/panns/deploy/predict.py index d4e5c22fb12b6453ba6ef6e4192f6a9442b960a9..ee566ed4f8e29171a41364b8e86bb143fb570796 100644 --- a/paddlespeech/cls/exps/panns/deploy/predict.py +++ b/paddlespeech/cls/exps/panns/deploy/predict.py @@ -16,11 +16,10 @@ import os import numpy as np from paddle import inference -from scipy.special import softmax - from paddleaudio.backends import load as load_audio from paddleaudio.datasets import ESC50 from paddleaudio.features import melspectrogram +from scipy.special import softmax # yapf: disable parser = argparse.ArgumentParser() diff --git a/paddlespeech/cls/exps/panns/export_model.py b/paddlespeech/cls/exps/panns/export_model.py index c295c6a33838b086480ddc4e681341cbd023d560..63b22981adb62d213f0b2bd79ae9d4b180d06591 100644 --- a/paddlespeech/cls/exps/panns/export_model.py +++ b/paddlespeech/cls/exps/panns/export_model.py @@ -15,8 +15,8 @@ import argparse import os import paddle - from paddleaudio.datasets import ESC50 + from paddlespeech.cls.models import cnn14 from paddlespeech.cls.models import SoundClassifier diff --git a/paddlespeech/cls/exps/panns/predict.py b/paddlespeech/cls/exps/panns/predict.py index ffe42d3904bc9b62c678b623147de320b287c071..a3f9f9a9b6771016e5a41252bd00432fc1c43557 100644 --- a/paddlespeech/cls/exps/panns/predict.py +++ b/paddlespeech/cls/exps/panns/predict.py @@ -17,10 +17,10 @@ import os import paddle import paddle.nn.functional as F import yaml - from paddleaudio.backends import load as load_audio from paddleaudio.features import LogMelSpectrogram from paddleaudio.utils import logger + from paddlespeech.cls.models import SoundClassifier from paddlespeech.s2t.utils.dynamic_import import dynamic_import diff --git a/paddlespeech/cls/exps/panns/train.py b/paddlespeech/cls/exps/panns/train.py index 7e292214827cdbbaaed51a51c175331cd159b098..5a2f3042a8a003fd96814dfef0737377e9dcf49a 100644 --- a/paddlespeech/cls/exps/panns/train.py +++ b/paddlespeech/cls/exps/panns/train.py @@ -16,10 +16,10 @@ import os import paddle import yaml - from paddleaudio.features import LogMelSpectrogram from paddleaudio.utils import logger from paddleaudio.utils import Timer + from paddlespeech.cls.models import SoundClassifier from paddlespeech.s2t.utils.dynamic_import import dynamic_import diff --git a/paddlespeech/cls/models/panns/panns.py b/paddlespeech/cls/models/panns/panns.py index 6d2dac56ac23d9b3322e49703f98e15faf936fd0..b442b2fd1224df90d0ec519124d2fc65397928c5 100644 --- a/paddlespeech/cls/models/panns/panns.py +++ b/paddlespeech/cls/models/panns/panns.py @@ -15,7 +15,6 @@ import os import paddle.nn as nn import paddle.nn.functional as F - from paddleaudio.utils.download import load_state_dict_from_url from paddleaudio.utils.env import MODEL_HOME diff --git a/paddlespeech/s2t/transform/spectrogram.py b/paddlespeech/s2t/transform/spectrogram.py index 4a65548fe141bb7e23b1b04fa990d998891d922d..2a93bedc87edbb9f33799fb145e19de4e0ee9d57 100644 --- a/paddlespeech/s2t/transform/spectrogram.py +++ b/paddlespeech/s2t/transform/spectrogram.py @@ -15,9 +15,8 @@ import librosa import numpy as np import paddle -from python_speech_features import logfbank - import paddleaudio.compliance.kaldi as kaldi +from python_speech_features import logfbank def stft(x, diff --git a/paddlespeech/server/engine/tts/online/onnx/tts_engine.py b/paddlespeech/server/engine/tts/online/onnx/tts_engine.py index abe99ae161ff9d860d21d9838e8da181ac2947fb..22c1c960700d74d003914f59595679cb8dbad9f1 100644 --- a/paddlespeech/server/engine/tts/online/onnx/tts_engine.py +++ b/paddlespeech/server/engine/tts/online/onnx/tts_engine.py @@ -124,7 +124,6 @@ class TTSServerExecutor(TTSExecutor): self.pretrained_models = pretrained_models self.model_alias = model_alias - def _get_pretrained_path(self, tag: str) -> os.PathLike: """ #Download and returns pretrained resources path of current task. @@ -140,7 +139,6 @@ class TTSServerExecutor(TTSExecutor): logger.info( 'Use pretrained model stored in: {}'.format(decompressed_path)) return decompressed_path - def _init_from_path( self, diff --git a/paddlespeech/server/util.py b/paddlespeech/server/util.py index 1f1b0be1bd82f112bfa7c6162fde42c236739243..ae3e9c6aa913174bc866cd071e6eaa28cd9c8059 100644 --- a/paddlespeech/server/util.py +++ b/paddlespeech/server/util.py @@ -24,11 +24,11 @@ from typing import Any from typing import Dict import paddle +import paddleaudio import requests import yaml from paddle.framework import load -import paddleaudio from . import download from .entry import client_commands from .entry import server_commands diff --git a/paddlespeech/vector/exps/ecapa_tdnn/extract_emb.py b/paddlespeech/vector/exps/ecapa_tdnn/extract_emb.py index 686de9363e82f121e59348441c09bb150984d218..e8d91bf3a50425c567b68eb4a408f1046f3b96ce 100644 --- a/paddlespeech/vector/exps/ecapa_tdnn/extract_emb.py +++ b/paddlespeech/vector/exps/ecapa_tdnn/extract_emb.py @@ -16,10 +16,10 @@ import os import time import paddle -from yacs.config import CfgNode - from paddleaudio.backends import load as load_audio from paddleaudio.compliance.librosa import melspectrogram +from yacs.config import CfgNode + from paddlespeech.s2t.utils.log import Log from paddlespeech.vector.io.batch import feature_normalize from paddlespeech.vector.models.ecapa_tdnn import EcapaTdnn diff --git a/paddlespeech/vector/exps/ecapa_tdnn/test.py b/paddlespeech/vector/exps/ecapa_tdnn/test.py index 1b38075d64aa1a5092164c6d9eda31eb6e3fe225..f15dbf9b7a111720de9481b9ce62104d47ea9e95 100644 --- a/paddlespeech/vector/exps/ecapa_tdnn/test.py +++ b/paddlespeech/vector/exps/ecapa_tdnn/test.py @@ -18,10 +18,10 @@ import numpy as np import paddle from paddle.io import BatchSampler from paddle.io import DataLoader +from paddleaudio.metric import compute_eer from tqdm import tqdm from yacs.config import CfgNode -from paddleaudio.metric import compute_eer from paddlespeech.s2t.utils.log import Log from paddlespeech.vector.io.batch import batch_feature_normalize from paddlespeech.vector.io.dataset import CSVDataset diff --git a/paddlespeech/vector/exps/ecapa_tdnn/train.py b/paddlespeech/vector/exps/ecapa_tdnn/train.py index 8855689d5ca894262d859223c75aec0e56304901..aad148a98b1e182aafb91907d4d016fde7c4657e 100644 --- a/paddlespeech/vector/exps/ecapa_tdnn/train.py +++ b/paddlespeech/vector/exps/ecapa_tdnn/train.py @@ -20,9 +20,9 @@ import paddle from paddle.io import BatchSampler from paddle.io import DataLoader from paddle.io import DistributedBatchSampler +from paddleaudio.compliance.librosa import melspectrogram from yacs.config import CfgNode -from paddleaudio.compliance.librosa import melspectrogram from paddlespeech.s2t.utils.log import Log from paddlespeech.vector.io.augment import build_augment_pipeline from paddlespeech.vector.io.augment import waveform_augment diff --git a/paddlespeech/vector/io/dataset.py b/paddlespeech/vector/io/dataset.py index 0a1b2ba5c669d46b6e2597d7a335b6f4c70d0a25..1b514f3d624f1f8ddce610835670bc4f680ecbd7 100644 --- a/paddlespeech/vector/io/dataset.py +++ b/paddlespeech/vector/io/dataset.py @@ -15,9 +15,9 @@ from dataclasses import dataclass from dataclasses import fields from paddle.io import Dataset - from paddleaudio import load as load_audio from paddleaudio.compliance.librosa import melspectrogram + from paddlespeech.s2t.utils.log import Log logger = Log(__name__).getlog() diff --git a/paddlespeech/vector/io/dataset_from_json.py b/paddlespeech/vector/io/dataset_from_json.py index a4d8c4524a504fc7349ca908fe416df7b52b6e35..bf04e1132950287d77786b6dc7050322a09b4226 100644 --- a/paddlespeech/vector/io/dataset_from_json.py +++ b/paddlespeech/vector/io/dataset_from_json.py @@ -16,7 +16,6 @@ from dataclasses import dataclass from dataclasses import fields from paddle.io import Dataset - from paddleaudio import load as load_audio from paddleaudio.compliance.librosa import melspectrogram from paddleaudio.compliance.librosa import mfcc diff --git a/tests/unit/server/online/tts/check_server/change_yaml.py b/tests/unit/server/online/tts/check_server/change_yaml.py index c46d5bd0f12cf6c11883ac2e7fe452e91c8b7407..01351df09316dd0894f8a632d13d7ce8676a50b9 100644 --- a/tests/unit/server/online/tts/check_server/change_yaml.py +++ b/tests/unit/server/online/tts/check_server/change_yaml.py @@ -4,6 +4,7 @@ import os import yaml + def change_value(args): yamlfile = args.config_file change_type = args.change_type