Both cmake and makefile use the same mkldnn commit hash

kaiseu · Mar 17, 2017 · ad2e525 · ad2e525
1 parent bf617d1
commit ad2e525
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Makefile.mkldnn b/Makefile.mkldnn
@@ -4,7 +4,7 @@ MKLDNN_TMPDIR := $(MKLDNN_ROOTDIR)/tmp
 MKLDNN_SRCDIR := $(MKLDNN_ROOTDIR)/src
 MKLDNN_BUILDDIR := $(MKLDNN_ROOTDIR)/build
 MKLDNN_INSTALLDIR := $(MKLDNN_ROOTDIR)/install
-MKLDNN_COMMIT := 10acb154eba2b05e862c91d7bebfc32dee3bd236
+MKLDNN_COMMIT := `cat ${CAFFE_ROOTDIR}/mkldnn.commit`
 MKLDNN_CXX := $(CXX)
 MKLDNN_CC := $(CC)
 

diff --git a/cmake/MKLDNN.cmake b/cmake/MKLDNN.cmake
@@ -5,13 +5,16 @@ function(Download_MKLDNN)
   set(MKLDNN_SOURCE_DIR ${MKLDNN_DIR}/src)
   set(MKLDNN_BUILD_DIR ${MKLDNN_DIR}/build)
   set(MKLDNN_INSTALL_DIR ${MKLDNN_DIR}/install CACHE PATH "Installation path of MKLDNN")
+  execute_process(COMMAND cat mkldnn.commit
+  		  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		  OUTPUT_VARIABLE MKLDNN_COMMIT)
 
   ExternalProject_add(MKLDNN_Build
                       SOURCE_DIR ${MKLDNN_SOURCE_DIR}
                       CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${MKLDNN_INSTALL_DIR} -DMKLROOT=${MKL_ROOT_DIR}
 #--Download step
                       GIT_REPOSITORY https://github.com/01org/mkl-dnn.git
-                      GIT_TAG 4c1d921bac0a10ef433ea5f667fdc7e4b04e1a4f
+		      GIT_TAG ${MKLDNN_COMMIT}
 #--Build step
                       BINARY_DIR ${MKLDNN_BUILD_DIR}
                       BUILD_COMMAND cmake ${MKLDNN_SOURCE_DIR}

diff --git a/mkldnn.commit b/mkldnn.commit
@@ -0,0 +1 @@
+4c1d921bac0a10ef433ea5f667fdc7e4b04e1a4f