From 2a66366be4c2715870e4859fd5a5db6e8a9dc00a Mon Sep 17 00:00:00 2001
From: chenmengzheAAA <123789350+chenmengzheAAA@users.noreply.github.com>
Date: 星期四, 14 九月 2023 19:00:17 +0800
Subject: [PATCH] Merge pull request #956 from alibaba-damo-academy/chenmengzheAAA-patch-4

---
 funasr/runtime/onnxruntime/src/precomp.h |   52 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/funasr/runtime/onnxruntime/src/precomp.h b/funasr/runtime/onnxruntime/src/precomp.h
index 79225ee..cbfcf56 100644
--- a/funasr/runtime/onnxruntime/src/precomp.h
+++ b/funasr/runtime/onnxruntime/src/precomp.h
@@ -1,6 +1,5 @@
 #pragma once 
 // system 
-
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -16,38 +15,45 @@
 #include <string>
 #include <math.h>
 #include <numeric>
-
-
 #include <cstring>
 
 using namespace std;
 // third part
+#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 "FsmnVad.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 "FeatureQueue.h"
-#include "SpeechWrap.h"
-#include <Audio.h>
+#include "seg_dict.h"
 #include "resample.h"
-#include "Model.h"
-#include "paraformer_onnx.h"
-#include "libfunasrapi.h"
-
-
-using namespace paraformer;
+#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