From a05e753d11d9c36983ec4e58c421dbcf86d1dcd4 Mon Sep 17 00:00:00 2001 From: Xian Shi <40013335+R1ckShi@users.noreply.github.com> Date: 星期二, 17 十月 2023 16:47:27 +0800 Subject: [PATCH] Merge branch 'main' into dev_onnx --- funasr/runtime/onnxruntime/src/precomp.h | 79 ++++++++++++++++++++++++++++----------- 1 files changed, 56 insertions(+), 23 deletions(-) diff --git a/funasr/runtime/onnxruntime/src/precomp.h b/funasr/runtime/onnxruntime/src/precomp.h index ec0766d..5c49fd6 100644 --- a/funasr/runtime/onnxruntime/src/precomp.h +++ b/funasr/runtime/onnxruntime/src/precomp.h @@ -1,49 +1,82 @@ #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> + +#ifdef _WIN32 +#include<io.h> +#ifndef R_OK +#define R_OK 4 +#endif +#ifndef W_OK +#define W_OK 2 +#endif +#ifndef X_OK +#define X_OK 0 +#endif +#ifndef F_OK +#define F_OK 0 +#endif +#define access _access +#else +#include <unistd.h> +#endif 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" +#include "itn-model.h" +#include "itn-processor.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 "Model.h" -#include "paraformer_onnx.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