From 7bfc4a84fc2d882f34928a033a6d5b60ff72fe19 Mon Sep 17 00:00:00 2001
From: lyblsgo <lyblsgo@163.com>
Date: 星期五, 21 四月 2023 10:53:50 +0800
Subject: [PATCH] rm fftw deps
---
funasr/runtime/onnxruntime/src/CMakeLists.txt | 11 ++++-------
funasr/runtime/onnxruntime/src/precomp.h | 2 --
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/funasr/runtime/onnxruntime/src/CMakeLists.txt b/funasr/runtime/onnxruntime/src/CMakeLists.txt
index ba3fc9a..6798b99 100644
--- a/funasr/runtime/onnxruntime/src/CMakeLists.txt
+++ b/funasr/runtime/onnxruntime/src/CMakeLists.txt
@@ -11,7 +11,7 @@
if(WIN32)
- set(EXTRA_LIBS libfftw3f-3 yaml-cpp)
+ set(EXTRA_LIBS pthread yaml-cpp csrc)
if(CMAKE_CL_64)
target_link_directories(funasr PUBLIC ${CMAKE_SOURCE_DIR}/win/lib/x64)
else()
@@ -22,9 +22,7 @@
target_compile_definitions(funasr PUBLIC -D_FUNASR_API_EXPORT)
else()
- set(EXTRA_LIBS fftw3f pthread yaml-cpp csrc)
- target_include_directories(funasr PUBLIC "/usr/local/opt/fftw/include")
- target_link_directories(funasr PUBLIC "/usr/local/opt/fftw/lib")
+ set(EXTRA_LIBS pthread yaml-cpp csrc)
target_include_directories(funasr PUBLIC "/usr/local/opt/openblas/include")
target_link_directories(funasr PUBLIC "/usr/local/opt/openblas/lib")
@@ -32,13 +30,12 @@
target_include_directories(funasr PUBLIC "/usr/include")
target_link_directories(funasr PUBLIC "/usr/lib64")
- target_include_directories(funasr PUBLIC ${FFTW3F_INCLUDE_DIR})
- target_link_directories(funasr PUBLIC ${FFTW3F_LIBRARY_DIR})
+ target_include_directories(funasr PUBLIC)
+ target_link_directories(funasr PUBLIC)
include_directories(${ONNXRUNTIME_DIR}/include)
endif()
include_directories(${CMAKE_SOURCE_DIR}/include)
target_link_libraries(funasr PUBLIC onnxruntime ${EXTRA_LIBS})
-
diff --git a/funasr/runtime/onnxruntime/src/precomp.h b/funasr/runtime/onnxruntime/src/precomp.h
index c83efb8..79225ee 100644
--- a/funasr/runtime/onnxruntime/src/precomp.h
+++ b/funasr/runtime/onnxruntime/src/precomp.h
@@ -22,8 +22,6 @@
using namespace std;
// third part
-
-#include <fftw3.h>
#include "onnxruntime_run_options_config_keys.h"
#include "onnxruntime_cxx_api.h"
#include "kaldi-native-fbank/csrc/feature-fbank.h"
--
Gitblit v1.9.1