Commit 278632dd authored by Pruthvi's avatar Pruthvi Committed by Robert Kimball

Upgrades MKLDNN to V0.18-rc (#2486)

* - MKLDNN would choose the algorithm which will potentially give best performance based on
- convolution dimensions number of logical processors available.

- (For auto-dispatching to work as intended,
- use the same thread affinity settings when creating the convolution as when executing the convolution.)
- The relationship between convolution sizes and the best performing algorithm is empirically based on performance observations

* bump mkldnn version to V0.18-rc

* Revert "- MKLDNN would choose the algorithm which will potentially give best performance based on"

This reverts commit 904beb8ad8d4e829fbae5f38a803ea80a72b3ffd.

* Update mkl-dnn patch for soversion removal.
parent 6e6c8af4
......@@ -53,17 +53,17 @@ endif()
# This section sets up MKL as an external project to be used later by MKLDNN
set(MKLURLROOT "https://github.com/intel/mkl-dnn/releases/download/v0.17.2/")
set(MKLVERSION "2019.0.1.20180928")
set(MKLURLROOT "https://github.com/intel/mkl-dnn/releases/download/v0.18-rc/")
set(MKLVERSION "2019.0.3.20190125")
if (LINUX)
set(MKLPACKAGE "mklml_lnx_${MKLVERSION}.tgz")
set(MKL_SHA1_HASH 0d9cc8bfc2c1a1e3df5e0b07e2f363bbf934a7e9)
set(MKL_SHA1_HASH 968318286897da5ffd225f0851aec18f02b347f8)
elseif (APPLE)
set(MKLPACKAGE "mklml_mac_${MKLVERSION}.tgz")
set(MKL_SHA1_HASH 232787f41cb42f53f5b7e278d8240f6727896133)
set(MKL_SHA1_HASH 8ef2f39b65f23d322af7400d261c3ec883b087c6)
elseif (WIN32)
set(MKLPACKAGE "mklml_win_${MKLVERSION}.zip")
set(MKL_SHA1_HASH 97f01ab854d8ee88cc0429f301df84844d7cce6b)
set(MKL_SHA1_HASH 8383d11b47960e3cd826e2af4b2a7daa9fbd8b68)
endif()
set(MKL_LIBS ${MKLML_LIB} ${OMP_LIB})
set(MKLURL ${MKLURLROOT}${MKLPACKAGE})
......@@ -144,7 +144,7 @@ else()
endif()
set(MKLDNN_GIT_REPO_URL https://github.com/intel/mkl-dnn)
set(MKLDNN_GIT_TAG "b9ce57a")
set(MKLDNN_GIT_TAG "08bd90c")
set(MKLDNN_PATCH_FILE mkldnn.patch)
set(MKLDNN_LIBS ${EXTERNAL_PROJECTS_ROOT}/mkldnn/lib/${MKLDNN_LIB})
......
diff --git a/cmake/OpenMP.cmake b/cmake/OpenMP.cmake
index f9c3620e..ccfefe4f 100644
index de9b24d7..766a2e7f 100644
--- a/cmake/OpenMP.cmake
+++ b/cmake/OpenMP.cmake
@@ -30,14 +30,18 @@ if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
......@@ -25,17 +25,11 @@ index f9c3620e..ccfefe4f 100644
set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83ed499a..05721370 100644
index d541d7ae..3d2b2599 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -98,10 +98,16 @@ else()
set(CTESTCONFIG_PATH "${CTESTCONFIG_PATH}\;${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE)
endif()
target_link_libraries(${TARGET_NAME} ${${TARGET_NAME}_LINKER_LIBS} ${EXTRA_LIBS})
+if(NOT APPLE)
+ set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--rpath,$ORIGIN")
+ set_target_properties(${TARGET_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN")
+endif()
@@ -168,8 +168,10 @@ target_link_libraries(
set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11)
set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-set_property(TARGET ${TARGET_NAME} PROPERTY VERSION "${PROJECT_VERSION}.0")
......@@ -45,5 +39,5 @@ index 83ed499a..05721370 100644
+ set_property(TARGET ${TARGET_NAME} PROPERTY SOVERSION "0")
+endif()
if(MINGW)
# We need to install *.dll into bin/ and *.a into lib/.
install(TARGETS ${TARGET_NAME}
EXPORT "${TARGETS_EXPORT_NAME}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment