From 31510d088ce29a86821ae4c4854fcd15f5925441 Mon Sep 17 00:00:00 2001 From: gongel Date: Thu, 9 Dec 2021 11:08:10 +0000 Subject: [PATCH 1/2] refactor: rm kaldi_io --- paddlespeech/cli/st/infer.py | 15 +++++++-------- setup.py | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/paddlespeech/cli/st/infer.py b/paddlespeech/cli/st/infer.py index d7b53a072..2bc985125 100644 --- a/paddlespeech/cli/st/infer.py +++ b/paddlespeech/cli/st/infer.py @@ -18,11 +18,14 @@ from typing import List from typing import Optional from typing import Union -import kaldi_io +import kaldiio import numpy as np import paddle import soundfile from kaldiio import WriteHelper +from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer +from paddlespeech.s2t.utils.dynamic_import import dynamic_import +from paddlespeech.s2t.utils.utility import UpdateConfig from yacs.config import CfgNode from ..executor import BaseExecutor @@ -30,9 +33,6 @@ from ..utils import cli_register from ..utils import download_and_decompress from ..utils import logger from ..utils import MODEL_HOME -from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer -from paddlespeech.s2t.utils.dynamic_import import dynamic_import -from paddlespeech.s2t.utils.utility import UpdateConfig __all__ = ["STExecutor"] @@ -234,7 +234,7 @@ class STExecutor(BaseExecutor): f"{utt_name} {wav_file}".encode("utf8")) fbank_extract_process.stdin.close() fbank_feat = dict( - kaldi_io.read_mat_ark(fbank_extract_process.stdout))[utt_name] + kaldiio.load_ark(fbank_extract_process.stdout))[utt_name] extract_command = ["compute-kaldi-pitch-feats", "scp:-", "ark:-"] pitch_extract_process = subprocess.Popen( @@ -251,8 +251,7 @@ class STExecutor(BaseExecutor): stdout=subprocess.PIPE, stderr=subprocess.PIPE) pitch_extract_process.stdin.close() - pitch_feat = dict( - kaldi_io.read_mat_ark(pitch_process.stdout))[utt_name] + pitch_feat = dict(kaldiio.load_ark(pitch_process.stdout))[utt_name] concated_feat = np.concatenate((fbank_feat, pitch_feat), axis=1) raw_feat = f"{utt_name}.raw" with WriteHelper( @@ -272,7 +271,7 @@ class STExecutor(BaseExecutor): stdin=cmvn_process.stdout, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - norm_feat = dict(kaldi_io.read_mat_ark(process.stdout))[utt_name] + norm_feat = dict(kaldiio.load_ark(process.stdout))[utt_name] self._inputs["audio"] = paddle.to_tensor(norm_feat).unsqueeze(0) self._inputs["audio_len"] = paddle.to_tensor( self._inputs["audio"].shape[1], dtype="int64") diff --git a/setup.py b/setup.py index 039ab82a7..9aaaa6eb1 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ requirements = { "jieba", "jsonlines", "kaldiio", - "kaldi_io", "librosa", "loguru", "matplotlib", From dc60aeb8c228583a86fae0fbdaf5f2c1c4d23a7f Mon Sep 17 00:00:00 2001 From: gongel Date: Thu, 9 Dec 2021 11:43:01 +0000 Subject: [PATCH 2/2] format --- paddlespeech/cli/st/infer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/paddlespeech/cli/st/infer.py b/paddlespeech/cli/st/infer.py index 2bc985125..32f9d425a 100644 --- a/paddlespeech/cli/st/infer.py +++ b/paddlespeech/cli/st/infer.py @@ -23,9 +23,6 @@ import numpy as np import paddle import soundfile from kaldiio import WriteHelper -from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer -from paddlespeech.s2t.utils.dynamic_import import dynamic_import -from paddlespeech.s2t.utils.utility import UpdateConfig from yacs.config import CfgNode from ..executor import BaseExecutor @@ -33,6 +30,9 @@ from ..utils import cli_register from ..utils import download_and_decompress from ..utils import logger from ..utils import MODEL_HOME +from paddlespeech.s2t.frontend.featurizer.text_featurizer import TextFeaturizer +from paddlespeech.s2t.utils.dynamic_import import dynamic_import +from paddlespeech.s2t.utils.utility import UpdateConfig __all__ = ["STExecutor"]