From bd9e63063f7cf6cd5f61d8633472fdd4b63484be Mon Sep 17 00:00:00 2001
From: szsteven008 <97944818+szsteven008@users.noreply.github.com>
Date: 星期二, 28 五月 2024 11:03:56 +0800
Subject: [PATCH] 修复了onnxruntime在macos下编译失败的错误 (#1748)
---
runtime/onnxruntime/include/funasrruntime.h | 4 ++--
runtime/onnxruntime/src/CMakeLists.txt | 8 ++++++++
runtime/onnxruntime/src/funasrruntime.cpp | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/runtime/onnxruntime/include/funasrruntime.h b/runtime/onnxruntime/include/funasrruntime.h
index cc9ba3d..ac9a3bd 100644
--- a/runtime/onnxruntime/include/funasrruntime.h
+++ b/runtime/onnxruntime/include/funasrruntime.h
@@ -106,9 +106,9 @@
_FUNASRAPI FUNASR_RESULT FunOfflineInfer(FUNASR_HANDLE handle, const char* sz_filename, FUNASR_MODE mode,
QM_CALLBACK fn_callback, const std::vector<std::vector<float>> &hw_emb,
int sampling_rate=16000, bool itn=true, FUNASR_DEC_HANDLE dec_handle=nullptr);
-#if !defined(__APPLE__)
+//#if !defined(__APPLE__)
_FUNASRAPI const std::vector<std::vector<float>> CompileHotwordEmbedding(FUNASR_HANDLE handle, std::string &hotwords, ASR_TYPE mode=ASR_OFFLINE);
-#endif
+//#endif
_FUNASRAPI void FunOfflineUninit(FUNASR_HANDLE handle);
diff --git a/runtime/onnxruntime/src/CMakeLists.txt b/runtime/onnxruntime/src/CMakeLists.txt
index 6d6b66b..ad83fe7 100644
--- a/runtime/onnxruntime/src/CMakeLists.txt
+++ b/runtime/onnxruntime/src/CMakeLists.txt
@@ -1,5 +1,9 @@
file(GLOB files1 "*.cpp")
+if(APPLE)
+ file(GLOB itn_files "itn-*.cpp")
+ list(REMOVE_ITEM files1 ${itn_files})
+endif(APPLE)
list(REMOVE_ITEM files1 "${CMAKE_CURRENT_SOURCE_DIR}/paraformer-torch.cpp")
set(files ${files1})
@@ -28,6 +32,10 @@
set(EXTRA_LIBS pthread yaml-cpp csrc kaldi-decoder fst glog gflags avutil avcodec avformat swresample)
include_directories(${ONNXRUNTIME_DIR}/include)
include_directories(${FFMPEG_DIR}/include)
+ if(APPLE)
+ target_link_directories(funasr PUBLIC ${ONNXRUNTIME_DIR}/lib)
+ target_link_directories(funasr PUBLIC ${FFMPEG_DIR}/lib)
+ endif(APPLE)
endif()
if(GPU)
diff --git a/runtime/onnxruntime/src/funasrruntime.cpp b/runtime/onnxruntime/src/funasrruntime.cpp
index d235e6f..93b89a5 100644
--- a/runtime/onnxruntime/src/funasrruntime.cpp
+++ b/runtime/onnxruntime/src/funasrruntime.cpp
@@ -446,7 +446,7 @@
return p_result;
}
-#if !defined(__APPLE__)
+//#if !defined(__APPLE__)
_FUNASRAPI const std::vector<std::vector<float>> CompileHotwordEmbedding(FUNASR_HANDLE handle, std::string &hotwords, ASR_TYPE mode)
{
if (mode == ASR_OFFLINE){
@@ -470,7 +470,7 @@
}
}
-#endif
+//#endif
// APIs for 2pass-stream Infer
_FUNASRAPI FUNASR_RESULT FunTpassInferBuffer(FUNASR_HANDLE handle, FUNASR_HANDLE online_handle, const char* sz_buf,
--
Gitblit v1.9.1