From b6b8b9cf8e3ade1202796c2a3a9e9e2e2aa9b325 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期一, 13 二月 2023 20:35:54 +0800
Subject: [PATCH] export model

---
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py  |    9 ++++-----
 funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py |    6 +++---
 kaldi-native-fbank                                                               |    1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
index b6ff0cd..e520008 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/paraformer_onnx.py
@@ -9,11 +9,11 @@
 import librosa
 import numpy as np
 
-from .utils.utils import (CharTokenizer, Hypothesis, ONNXRuntimeError,
+from utils.utils import (CharTokenizer, Hypothesis, ONNXRuntimeError,
                     OrtInferSession, TokenIDConverter, get_logger,
                     read_yaml)
-from .utils.postprocess_utils import sentence_postprocess
-from .utils.frontend import WavFrontend
+from utils.postprocess_utils import sentence_postprocess
+from utils.frontend import WavFrontend
 
 logging = get_logger()
 
diff --git a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py
index f973f65..9f0c535 100644
--- a/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py
+++ b/funasr/runtime/python/onnxruntime/paraformer/rapid_paraformer/utils/frontend.py
@@ -43,8 +43,6 @@
         opts.mel_opts.debug_mel = False
         self.opts = opts
 
-        self.compute_fbank_feats = knf.OnlineFbank(self.opts)
-
         self.filter_length_min = filter_length_min
         self.filter_length_max = filter_length_max
         self.lfr_m = lfr_m
@@ -57,11 +55,12 @@
     def fbank(self,
               waveform: np.ndarray) -> Tuple[np.ndarray, np.ndarray]:
         waveform = waveform * (1 << 15)
-        self.compute_fbank_feats.accept_waveform(self.opts.frame_opts.samp_freq, waveform.tolist())
-        frames = self.compute_fbank_feats.num_frames_ready
+        fbank_fn = knf.OnlineFbank(self.opts)
+        fbank_fn.accept_waveform(self.opts.frame_opts.samp_freq, waveform.tolist())
+        frames = fbank_fn.num_frames_ready
         mat = np.empty([frames, self.opts.mel_opts.num_bins])
         for i in range(frames):
-            mat[i, :] = self.compute_fbank_feats.get_frame(i)
+            mat[i, :] = fbank_fn.get_frame(i)
         feat = mat.astype(np.float32)
         feat_len = np.array(mat.shape[0]).astype(np.int32)
         return feat, feat_len
diff --git a/kaldi-native-fbank b/kaldi-native-fbank
new file mode 120000
index 0000000..8b45d84
--- /dev/null
+++ b/kaldi-native-fbank
@@ -0,0 +1 @@
+../kaldi-native-fbank
\ No newline at end of file

--
Gitblit v1.9.1