提交 31510d08 编写于 作者: G gongel

refactor: rm kaldi_io

上级 12318566
...@@ -18,11 +18,14 @@ from typing import List ...@@ -18,11 +18,14 @@ from typing import List
from typing import Optional from typing import Optional
from typing import Union from typing import Union
import kaldi_io import kaldiio
import numpy as np import numpy as np
import paddle import paddle
import soundfile import soundfile
from kaldiio import WriteHelper 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 yacs.config import CfgNode
from ..executor import BaseExecutor from ..executor import BaseExecutor
...@@ -30,9 +33,6 @@ from ..utils import cli_register ...@@ -30,9 +33,6 @@ from ..utils import cli_register
from ..utils import download_and_decompress from ..utils import download_and_decompress
from ..utils import logger from ..utils import logger
from ..utils import MODEL_HOME 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"] __all__ = ["STExecutor"]
...@@ -234,7 +234,7 @@ class STExecutor(BaseExecutor): ...@@ -234,7 +234,7 @@ class STExecutor(BaseExecutor):
f"{utt_name} {wav_file}".encode("utf8")) f"{utt_name} {wav_file}".encode("utf8"))
fbank_extract_process.stdin.close() fbank_extract_process.stdin.close()
fbank_feat = dict( 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:-"] extract_command = ["compute-kaldi-pitch-feats", "scp:-", "ark:-"]
pitch_extract_process = subprocess.Popen( pitch_extract_process = subprocess.Popen(
...@@ -251,8 +251,7 @@ class STExecutor(BaseExecutor): ...@@ -251,8 +251,7 @@ class STExecutor(BaseExecutor):
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
pitch_extract_process.stdin.close() pitch_extract_process.stdin.close()
pitch_feat = dict( pitch_feat = dict(kaldiio.load_ark(pitch_process.stdout))[utt_name]
kaldi_io.read_mat_ark(pitch_process.stdout))[utt_name]
concated_feat = np.concatenate((fbank_feat, pitch_feat), axis=1) concated_feat = np.concatenate((fbank_feat, pitch_feat), axis=1)
raw_feat = f"{utt_name}.raw" raw_feat = f"{utt_name}.raw"
with WriteHelper( with WriteHelper(
...@@ -272,7 +271,7 @@ class STExecutor(BaseExecutor): ...@@ -272,7 +271,7 @@ class STExecutor(BaseExecutor):
stdin=cmvn_process.stdout, stdin=cmvn_process.stdout,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=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"] = paddle.to_tensor(norm_feat).unsqueeze(0)
self._inputs["audio_len"] = paddle.to_tensor( self._inputs["audio_len"] = paddle.to_tensor(
self._inputs["audio"].shape[1], dtype="int64") self._inputs["audio"].shape[1], dtype="int64")
......
...@@ -37,7 +37,6 @@ requirements = { ...@@ -37,7 +37,6 @@ requirements = {
"jieba", "jieba",
"jsonlines", "jsonlines",
"kaldiio", "kaldiio",
"kaldi_io",
"librosa", "librosa",
"loguru", "loguru",
"matplotlib", "matplotlib",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册