saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-11 00:49:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

change mkldnn so path (#210)

Browse source
This commit is contained in:
Changming Sun 2018-12-19 14:45:57 -08:00 committed by KeDengMS
parent 84231ba003
commit e97caa7787
4 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/CMakeLists.txt
View file

@ -397,15 +397,19 @@ if (onnxruntime_USE_MKLML)
add_definitions(-DUSE_MKLML=1)
# USE_MKML_FOR_BLAS may cause numerical differences in tests so disable by default
#add_definitions(-DUSE_MKLML_FOR_BLAS=1)
list(APPEND onnxruntime_EXTERNAL_LIBRARIES mklml)
list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES mklml)
if (WIN32 OR APPLE)
list(APPEND onnxruntime_EXTERNAL_LIBRARIES mklml)
else()
list(APPEND onnxruntime_EXTERNAL_LIBRARIES mklml_intel)
endif()
list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES project_mklml)
link_directories(${MKLML_LIB_DIR})
endif()
if (onnxruntime_USE_MKLDNN)
add_definitions(-DUSE_MKLDNN=1)
list(APPEND onnxruntime_EXTERNAL_LIBRARIES mkldnn)
list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES mkldnn)
list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES project_mkldnn)
link_directories(${MKLDNN_LIB_DIR})
endif()

21
cmake/external/mkldnn.cmake vendored
View file

@ -45,15 +45,7 @@ if (onnxruntime_USE_MKLML)
set(MKML_DIR ${CMAKE_CURRENT_BINARY_DIR}/mklml/src/project_mklml)
set(MKLML_INCLUDE_DIR "${MKML_DIR}/include")
set(MKLML_LIB_DIR "${MKML_DIR}/lib")
if(WIN32)
add_library(mklml STATIC IMPORTED)
set_property(TARGET mklml PROPERTY IMPORTED_LOCATION ${MKLML_LIB_DIR}/${MKLML_IMPORT_LIB})
else()
add_library(mklml SHARED IMPORTED)
set_property(TARGET mklml PROPERTY IMPORTED_LOCATION ${MKLML_LIB_DIR}/${MKLML_SHARED_LIB})
endif()
add_dependencies(mklml project_mklml)
include_directories(${MKLML_INCLUDE_DIR})
link_directories(${MKLML_LIB_DIR})
endif()
if (onnxruntime_USE_MKLDNN)
@ -74,17 +66,8 @@ if (onnxruntime_USE_MKLDNN)
SOURCE_DIR ${MKLDNN_SOURCE}
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${MKLDNN_INSTALL} -DMKLROOT=${MKML_DIR}
)
link_directories(${MKLDNN_LIB_DIR})
if (onnxruntime_USE_MKLML)
add_dependencies(project_mkldnn project_mklml)
endif()
if(WIN32)
add_library(mkldnn STATIC IMPORTED)
set_property(TARGET mkldnn PROPERTY IMPORTED_LOCATION ${MKLDNN_LIB_DIR}/${MKLDNN_IMPORT_LIB})
else()
add_library(mkldnn SHARED IMPORTED)
set_property(TARGET mkldnn PROPERTY IMPORTED_LOCATION ${MKLDNN_LIB_DIR}/${MKLDNN_SHARED_LIB})
endif()
add_dependencies(mkldnn project_mkldnn)
include_directories(${MKLDNN_INCLUDE_DIR})
endif()

2
cmake/onnxruntime_providers.cmake
View file

@ -94,7 +94,7 @@ if (onnxruntime_USE_MKLDNN)
onnxruntime_add_include_to_target(onnxruntime_providers_mkldnn onnx protobuf::libprotobuf)
add_dependencies(onnxruntime_providers_mkldnn eigen ${onnxruntime_EXTERNAL_DEPENDENCIES})
set_target_properties(onnxruntime_providers_mkldnn PROPERTIES FOLDER "ONNXRuntime")
target_include_directories(onnxruntime_providers_mkldnn PRIVATE ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS})
target_include_directories(onnxruntime_providers_mkldnn PRIVATE ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS} ${MKLDNN_INCLUDE_DIR} ${MKLML_INCLUDE_DIR})
install(DIRECTORY ${PROJECT_SOURCE_DIR}/../include/onnxruntime/core/providers/mkldnn DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnxruntime/core/providers)
set_target_properties(onnxruntime_providers_mkldnn PROPERTIES LINKER_LANGUAGE CXX)
endif()

2
cmake/onnxruntime_util.cmake
View file

@ -9,7 +9,7 @@ file(GLOB_RECURSE onnxruntime_util_srcs
source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_util_srcs})
add_library(onnxruntime_util ${onnxruntime_util_srcs})
target_include_directories(onnxruntime_util PRIVATE ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS})
target_include_directories(onnxruntime_util PRIVATE ${ONNXRUNTIME_ROOT} ${eigen_INCLUDE_DIRS} ${MKLDNN_INCLUDE_DIR} ${MKLML_INCLUDE_DIR})
onnxruntime_add_include_to_target(onnxruntime_util onnx protobuf::libprotobuf)
set_target_properties(onnxruntime_util PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(onnxruntime_util PROPERTIES FOLDER "ONNXRuntime")