Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
RapidASR
Commits
67e8cd2f
Commit
67e8cd2f
authored
Feb 28, 2023
by
mayong
Browse files
Remove libopenblas
parent
b705d233
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
cpp_onnx/src/lib/CMakeLists.txt
cpp_onnx/src/lib/CMakeLists.txt
+5
-5
cpp_onnx/src/lib/precomp.h
cpp_onnx/src/lib/precomp.h
+1
-0
cpp_onnx/src/lib/util.h
cpp_onnx/src/lib/util.h
+0
-2
No files found.
cpp_onnx/src/lib/CMakeLists.txt
View file @
67e8cd2f
...
...
@@ -10,18 +10,18 @@ add_library(rapidasr ${files})
if
(
WIN32
)
set
(
EXTRA_LIBS libfftw3f-3
libopenblas
webrtcvad
)
set
(
EXTRA_LIBS libfftw3f-3 webrtcvad
)
if
(
CMAKE_CL_64
)
target_link_directories
(
rapidasr PUBLIC
${
CMAKE_SOURCE_DIR
}
/win/lib/x64
)
else
()
target_link_directories
(
rapidasr PUBLIC
${
CMAKE_SOURCE_DIR
}
/win/lib/x86
)
endif
()
target_include_directories
(
rapidasr PUBLIC
${
CMAKE_SOURCE_DIR
}
/win/include
${
CMAKE_SOURCE_DIR
}
/win/include/openblas
)
target_include_directories
(
rapidasr PUBLIC
${
CMAKE_SOURCE_DIR
}
/win/include
)
else
()
set
(
EXTRA_LIBS fftw3f
openblas
webrtcvad pthread
)
set
(
EXTRA_LIBS fftw3f webrtcvad pthread
)
target_include_directories
(
rapidasr PUBLIC
"/usr/local/opt/fftw/include"
)
target_link_directories
(
rapidasr PUBLIC
"/usr/local/opt/fftw/lib"
)
...
...
@@ -31,8 +31,8 @@ else()
target_include_directories
(
rapidasr PUBLIC
"/usr/include"
)
target_link_directories
(
rapidasr PUBLIC
"/usr/lib64"
)
target_include_directories
(
rapidasr PUBLIC
${
OPENBLAS_INCLUDE_DIR
}
${
FFTW3F_INCLUDE_DIR
}
)
target_link_directories
(
rapidasr PUBLIC
${
OPENBLAS_LIBRARY_DIR
}
${
FFTW3F_LIBRARY_DIR
}
)
target_include_directories
(
rapidasr PUBLIC
${
FFTW3F_INCLUDE_DIR
}
)
target_link_directories
(
rapidasr PUBLIC
${
FFTW3F_LIBRARY_DIR
}
)
include_directories
(
${
ONNXRUNTIME_DIR
}
/include
)
endif
()
...
...
cpp_onnx/src/lib/precomp.h
View file @
67e8cd2f
...
...
@@ -35,6 +35,7 @@ using namespace std;
#include <ComDefine.h>
//#include "alignedmem.h"
#include "Vocab.h"
#include "Tensor.h"
#include "util.h"
#include "CommonStruct.h"
#include "FeatureExtract.h"
...
...
cpp_onnx/src/lib/util.h
View file @
67e8cd2f
...
...
@@ -2,8 +2,6 @@
#ifndef UTIL_H
#define UTIL_H
#include "Tensor.h"
#include <iostream>
using
namespace
std
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment