diff --git a/CMakeLists.txt b/CMakeLists.txt index 62ab4669cba551bfa6b9e342bfb634842f3ef04c..4cdd8dbd77b98b5d434a23622f400ba6b813e59c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,7 +145,7 @@ if(WITH_GPU) endif(WITH_GPU) if(WITH_MKLDNN) - list(APPEND EXTERNAL_LIBS ${MKLDNN_LIBRARY} ${MKLML_LIB_IOMP}) + list(APPEND EXTERNAL_LIBS ${MKLDNN_LIBRARY} ${MKLDNN_IOMP_LIB}) endif() if(USE_NNPACK) diff --git a/cmake/external/mkldnn.cmake b/cmake/external/mkldnn.cmake index fba0756f3dcd121a3e5d533606eb34ce861f3a29..2b744792738f5d6146c15c8c05110e189d52d236 100644 --- a/cmake/external/mkldnn.cmake +++ b/cmake/external/mkldnn.cmake @@ -41,6 +41,7 @@ INCLUDE_DIRECTORIES(${MKLDNN_INCLUDE_DIR}) IF(${CBLAS_PROVIDER} STREQUAL "MKLML") SET(MKLDNN_DEPENDS ${MKLML_PROJECT}) SET(MKLDNN_MKLROOT ${MKLML_ROOT}) + SET(MKLDNN_IOMP_LIB ${MKLML_IOMP_LIB}) SET(MKLDNN_IOMP_DIR ${MKLML_LIB_DIR}) ENDIF() @@ -59,7 +60,7 @@ ExternalProject_Add( UPDATE_COMMAND "" ) -ADD_LIBRARY(mkldnn STATIC IMPORTED GLOBAL) +ADD_LIBRARY(mkldnn SHARED IMPORTED GLOBAL) SET_PROPERTY(TARGET mkldnn PROPERTY IMPORTED_LOCATION ${MKLDNN_LIBRARY}) ADD_DEPENDENCIES(mkldnn ${MKLDNN_PROJECT}) MESSAGE(STATUS "Mkldnn library: ${MKLDNN_LIBRARY}") diff --git a/cmake/external/mklml.cmake b/cmake/external/mklml.cmake index 45b3f9d85bec6a177e030beb4ce9a3c9f5e98ada..dff51baec34554381cfac0476910c46e4de3d50d 100644 --- a/cmake/external/mklml.cmake +++ b/cmake/external/mklml.cmake @@ -48,14 +48,7 @@ ExternalProject_Add( TEST_COMMAND "" ) -IF (${CMAKE_VERSION} VERSION_LESS "3.3.0") - SET(dummyfile ${CMAKE_CURRENT_BINARY_DIR}/mklml_dummy.c) - FILE(WRITE ${dummyfile} "const char * dummy_mklml = \"${dummyfile}\";") - ADD_LIBRARY(mklml STATIC ${dummyfile}) -ELSE() - ADD_LIBRARY(mklml INTERFACE) -ENDIF() - +ADD_LIBRARY(mklml SHARED IMPORTED GLOBAL) +SET_PROPERTY(TARGET mklml PROPERTY IMPORTED_LOCATION ${MKLML_LIB}) ADD_DEPENDENCIES(mklml ${MKLML_PROJECT}) - LIST(APPEND external_project_dependencies mklml)