From 33d3d2084403fd34b79c835d2f2fe04f6cd8f738 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 13 九月 2023 09:33:54 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add

---
 funasr/runtime/onnxruntime/src/precomp.h |   59 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/funasr/runtime/onnxruntime/src/precomp.h b/funasr/runtime/onnxruntime/src/precomp.h
index 358844b..cbfcf56 100644
--- a/funasr/runtime/onnxruntime/src/precomp.h
+++ b/funasr/runtime/onnxruntime/src/precomp.h
@@ -1,50 +1,59 @@
 #pragma once 
 // system 
-
-#include <iostream>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <deque>
 #include <iostream>
+#include <fstream>
+#include <sstream>
+#include <iterator>
 #include <list>
 #include <locale.h>
 #include <vector>
 #include <string>
 #include <math.h>
 #include <numeric>
-
-
 #include <cstring>
 
 using namespace std;
 // third part
-
-#include <fftw3.h>
+#if defined(__APPLE__)
+#include <onnxruntime/onnxruntime_cxx_api.h>
+#else
 #include "onnxruntime_run_options_config_keys.h"
 #include "onnxruntime_cxx_api.h"
+#endif
 
+#include "kaldi-native-fbank/csrc/feature-fbank.h"
+#include "kaldi-native-fbank/csrc/online-feature.h"
 
 // mine
-
+#include <glog/logging.h>
+#include "common-struct.h"
+#include "com-define.h"
 #include "commonfunc.h"
-#include <ComDefine.h>
-#include "predefine_coe.h"
-
-#include <ComDefine.h>
-//#include "alignedmem.h"
-#include "Vocab.h"
-#include "Tensor.h"
+#include "predefine-coe.h"
+#include "model.h"
+#include "vad-model.h"
+#include "punc-model.h"
+#include "tokenizer.h"
+#include "ct-transformer.h"
+#include "ct-transformer-online.h"
+#include "e2e-vad.h"
+#include "fsmn-vad.h"
+#include "encode_converter.h"
+#include "vocab.h"
+#include "audio.h"
+#include "fsmn-vad-online.h"
+#include "tensor.h"
 #include "util.h"
-#include "CommonStruct.h"
-#include "FeatureExtract.h"
-#include "FeatureQueue.h"
-#include "SpeechWrap.h"
-#include <Audio.h>
-#include "Model.h"
-#include "paraformer_onnx.h"
-#include "librapidasrapi.h"
-
-
-using namespace paraformer;
+#include "seg_dict.h"
+#include "resample.h"
+#include "paraformer.h"
+#include "paraformer-online.h"
+#include "offline-stream.h"
+#include "tpass-stream.h"
+#include "tpass-online-stream.h"
+#include "funasrruntime.h"

--
Gitblit v1.9.1