From 28a19dbc4e85d3b8a4ec2ef7483bba64d422b43f Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期三, 12 四月 2023 18:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into dev_aky
---
funasr/runtime/triton_gpu/model_repo_paraformer_large_offline/feature_extractor/1/model.py | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/funasr/runtime/triton_gpu/model_repo_paraformer_large_offline/feature_extractor/1/model.py b/funasr/runtime/triton_gpu/model_repo_paraformer_large_offline/feature_extractor/1/model.py
index 517a789..2f84bb8 100644
--- a/funasr/runtime/triton_gpu/model_repo_paraformer_large_offline/feature_extractor/1/model.py
+++ b/funasr/runtime/triton_gpu/model_repo_paraformer_large_offline/feature_extractor/1/model.py
@@ -229,22 +229,24 @@
if key == "config_path":
with open(str(value), 'rb') as f:
config = yaml.load(f, Loader=yaml.Loader)
+ if key == "cmvn_path":
+ cmvn_path = str(value)
opts = kaldifeat.FbankOptions()
opts.frame_opts.dither = 1.0 # TODO: 0.0 or 1.0
- opts.frame_opts.window_type = config['WavFrontend']['frontend_conf']['window']
- opts.mel_opts.num_bins = int(config['WavFrontend']['frontend_conf']['n_mels'])
- opts.frame_opts.frame_shift_ms = float(config['WavFrontend']['frontend_conf']['frame_shift'])
- opts.frame_opts.frame_length_ms = float(config['WavFrontend']['frontend_conf']['frame_length'])
- opts.frame_opts.samp_freq = int(config['WavFrontend']['frontend_conf']['fs'])
+ opts.frame_opts.window_type = config['frontend_conf']['window']
+ opts.mel_opts.num_bins = int(config['frontend_conf']['n_mels'])
+ opts.frame_opts.frame_shift_ms = float(config['frontend_conf']['frame_shift'])
+ opts.frame_opts.frame_length_ms = float(config['frontend_conf']['frame_length'])
+ opts.frame_opts.samp_freq = int(config['frontend_conf']['fs'])
opts.device = torch.device(self.device)
self.opts = opts
self.feature_extractor = Fbank(self.opts)
self.feature_size = opts.mel_opts.num_bins
self.frontend = WavFrontend(
- cmvn_file=config['WavFrontend']['cmvn_file'],
- **config['WavFrontend']['frontend_conf'])
+ cmvn_file=cmvn_path,
+ **config['frontend_conf'])
def extract_feat(self,
waveform_list: List[np.ndarray]
--
Gitblit v1.9.1