From 84d712d4935eb14695bebee19360fd30644deedf Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Mon, 28 Mar 2022 12:16:06 +0000 Subject: [PATCH] format code, test=doc --- dataset/librispeech/librispeech.py | 2 +- demos/audio_searching/src/encode.py | 2 +- demos/audio_searching/src/operations/load.py | 5 ++--- examples/ami/sd0/local/ami_prepare.py | 2 +- paddlespeech/s2t/decoders/recog_bin.py | 2 +- paddlespeech/s2t/utils/cli_utils.py | 2 +- paddlespeech/s2t/utils/utility.py | 2 +- paddlespeech/vector/cluster/diarization.py | 2 +- utils/DER.py | 2 +- utils/addjson.py | 2 +- utils/apply-cmvn.py | 2 +- utils/copy-feats.py | 1 + utils/merge_scp2json.py | 3 ++- 13 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dataset/librispeech/librispeech.py b/dataset/librispeech/librispeech.py index 69f0db59..65cab249 100644 --- a/dataset/librispeech/librispeech.py +++ b/dataset/librispeech/librispeech.py @@ -20,12 +20,12 @@ of each audio file in the data set. """ import argparse import codecs -import distutils.util import io import json import os from multiprocessing.pool import Pool +import distutils.util import soundfile from utils.utility import download diff --git a/demos/audio_searching/src/encode.py b/demos/audio_searching/src/encode.py index 83b9e3df..cf5f29a4 100644 --- a/demos/audio_searching/src/encode.py +++ b/demos/audio_searching/src/encode.py @@ -16,8 +16,8 @@ import os import librosa import numpy as np from config import DEFAULT_TABLE - from logs import LOGGER + from paddlespeech.cli import VectorExecutor vector_executor = VectorExecutor() diff --git a/demos/audio_searching/src/operations/load.py b/demos/audio_searching/src/operations/load.py index 7a295bf3..80b6375f 100644 --- a/demos/audio_searching/src/operations/load.py +++ b/demos/audio_searching/src/operations/load.py @@ -26,9 +26,8 @@ def get_audios(path): """ supported_formats = [".wav", ".mp3", ".ogg", ".flac", ".m4a"] return [ - item - for sublist in [[os.path.join(dir, file) for file in files] - for dir, _, files in list(os.walk(path))] + item for sublist in [[os.path.join(dir, file) for file in files] + for dir, _, files in list(os.walk(path))] for item in sublist if os.path.splitext(item)[1] in supported_formats ] diff --git a/examples/ami/sd0/local/ami_prepare.py b/examples/ami/sd0/local/ami_prepare.py index 569c3a60..1f02afe0 100644 --- a/examples/ami/sd0/local/ami_prepare.py +++ b/examples/ami/sd0/local/ami_prepare.py @@ -24,11 +24,11 @@ import json import logging import os import xml.etree.ElementTree as et -from distutils.util import strtobool from ami_splits import get_AMI_split from dataio import load_pkl from dataio import save_pkl +from distutils.util import strtobool logger = logging.getLogger(__name__) SAMPLERATE = 16000 diff --git a/paddlespeech/s2t/decoders/recog_bin.py b/paddlespeech/s2t/decoders/recog_bin.py index cd7a360a..0470a034 100644 --- a/paddlespeech/s2t/decoders/recog_bin.py +++ b/paddlespeech/s2t/decoders/recog_bin.py @@ -17,10 +17,10 @@ import logging import os import random import sys -from distutils.util import strtobool import configargparse import numpy as np +from distutils.util import strtobool def get_parser(): diff --git a/paddlespeech/s2t/utils/cli_utils.py b/paddlespeech/s2t/utils/cli_utils.py index 4aee3f43..ccb0d3c9 100644 --- a/paddlespeech/s2t/utils/cli_utils.py +++ b/paddlespeech/s2t/utils/cli_utils.py @@ -14,9 +14,9 @@ # Modified from espnet(https://github.com/espnet/espnet) import sys from collections.abc import Sequence -from distutils.util import strtobool as dist_strtobool import numpy +from distutils.util import strtobool as dist_strtobool def strtobool(x): diff --git a/paddlespeech/s2t/utils/utility.py b/paddlespeech/s2t/utils/utility.py index dc1be815..fdd8c029 100644 --- a/paddlespeech/s2t/utils/utility.py +++ b/paddlespeech/s2t/utils/utility.py @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. """Contains common utility functions.""" -import distutils.util import math import os import random @@ -21,6 +20,7 @@ from contextlib import contextmanager from pprint import pformat from typing import List +import distutils.util import numpy as np import paddle import soundfile diff --git a/paddlespeech/vector/cluster/diarization.py b/paddlespeech/vector/cluster/diarization.py index 99ac41cd..597aa480 100644 --- a/paddlespeech/vector/cluster/diarization.py +++ b/paddlespeech/vector/cluster/diarization.py @@ -18,11 +18,11 @@ A few sklearn functions are modified in this script as per requirement. """ import argparse import warnings -from distutils.util import strtobool import numpy as np import scipy import sklearn +from distutils.util import strtobool from scipy import sparse from scipy.sparse.csgraph import connected_components from scipy.sparse.csgraph import laplacian as csgraph_laplacian diff --git a/utils/DER.py b/utils/DER.py index d6ab695d..59bcbec4 100755 --- a/utils/DER.py +++ b/utils/DER.py @@ -26,9 +26,9 @@ import argparse import os import re import subprocess -from distutils.util import strtobool import numpy as np +from distutils.util import strtobool FILE_IDS = re.compile(r"(?<=Speaker Diarization for).+(?=\*\*\*)") SCORED_SPEAKER_TIME = re.compile(r"(?<=SCORED SPEAKER TIME =)[\d.]+") diff --git a/utils/addjson.py b/utils/addjson.py index 013d1472..e1be7ab3 100755 --- a/utils/addjson.py +++ b/utils/addjson.py @@ -10,8 +10,8 @@ import codecs import json import logging import sys -from distutils.util import strtobool +from distutils.util import strtobool from espnet.utils.cli_utils import get_commandline_args is_python2 = sys.version_info[0] == 2 diff --git a/utils/apply-cmvn.py b/utils/apply-cmvn.py index b92e58f4..cf91bdfc 100755 --- a/utils/apply-cmvn.py +++ b/utils/apply-cmvn.py @@ -1,10 +1,10 @@ #!/usr/bin/env python3 import argparse import logging -from distutils.util import strtobool import kaldiio import numpy +from distutils.util import strtobool from paddlespeech.s2t.transform.cmvn import CMVN from paddlespeech.s2t.utils.cli_readers import file_reader_helper diff --git a/utils/copy-feats.py b/utils/copy-feats.py index 2e120881..dc7a70b4 100755 --- a/utils/copy-feats.py +++ b/utils/copy-feats.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import argparse import logging + from distutils.util import strtobool from paddlespeech.s2t.transform.transformation import Transformation diff --git a/utils/merge_scp2json.py b/utils/merge_scp2json.py index 650e4669..99db6bac 100755 --- a/utils/merge_scp2json.py +++ b/utils/merge_scp2json.py @@ -5,9 +5,10 @@ import codecs import json import logging import sys -from distutils.util import strtobool from io import open +from distutils.util import strtobool + from paddlespeech.s2t.utils.cli_utils import get_commandline_args PY2 = sys.version_info[0] == 2