From 2304327a3fde3aeca144fcc32bcd9e1905ade46a Mon Sep 17 00:00:00 2001
From: lyblsgo <lyblsgo@163.com>
Date: 星期三, 19 四月 2023 11:33:08 +0800
Subject: [PATCH] fix some variables
---
funasr/runtime/onnxruntime/src/paraformer_onnx.h | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/paraformer_onnx.h b/funasr/runtime/onnxruntime/src/paraformer_onnx.h
index 5d3b0fe..6442af3 100644
--- a/funasr/runtime/onnxruntime/src/paraformer_onnx.h
+++ b/funasr/runtime/onnxruntime/src/paraformer_onnx.h
@@ -4,32 +4,32 @@
#ifndef PARAFORMER_MODELIMP_H
#define PARAFORMER_MODELIMP_H
+#include "kaldi-native-fbank/csrc/feature-fbank.h"
+#include "kaldi-native-fbank/csrc/online-feature.h"
+
namespace paraformer {
class ModelImp : public Model {
private:
- //FeatureExtract* fe;
+ //std::unique_ptr<knf::OnlineFbank> fbank_;
+ knf::FbankOptions fbank_opts;
Vocab* vocab;
vector<float> means_list;
vector<float> vars_list;
const float scale = 22.6274169979695;
+ int32_t lfr_window_size = 7;
+ int32_t lfr_window_shift = 6;
- void apply_lfr(Tensor<float>*& din);
- void apply_cmvn(Tensor<float>* din);
void load_cmvn(const char *filename);
+ vector<float> ApplyLFR(const vector<float> &in);
+ void ApplyCMVN(vector<float> *v);
string greedy_search( float* in, int nLen);
-#ifdef _WIN_X86
- Ort::MemoryInfo m_memoryInfo = Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU);
-#else
- Ort::MemoryInfo m_memoryInfo = Ort::MemoryInfo::CreateCpu(OrtArenaAllocator, OrtMemTypeDefault);
-#endif
-
- Ort::Session* m_session = nullptr;
- Ort::Env env = Ort::Env(ORT_LOGGING_LEVEL_ERROR, "paraformer");
- Ort::SessionOptions sessionOptions = Ort::SessionOptions();
+ std::unique_ptr<Ort::Session> m_session;
+ Ort::Env env_;
+ Ort::SessionOptions sessionOptions;
vector<string> m_strInputNames, m_strOutputNames;
vector<const char*> m_szInputNames;
@@ -39,6 +39,7 @@
ModelImp(const char* path, int nNumThread=0, bool quantize=false);
~ModelImp();
void reset();
+ vector<float> FbankKaldi(float sample_rate, const float* waves, int len);
string forward_chunk(float* din, int len, int flag);
string forward(float* din, int len, int flag);
string rescoring();
--
Gitblit v1.9.1