Upgrade MKL-DNN dependency to v1.1 (#16823)

* upgrade to v1.1 and handle renaming

* softlink for mkldnn_version.h; make clean

* libmkldnn.a -> libdnnl.a

.gitignore

@@ -164,4 +164,5 @@ coverage.xml
 cmake_options.yml
 
 # header file generated at compile time
-include/mkldnn/mkldnn_version.h
+include/mkldnn/dnnl_version.h
+include/mkldnn/dnnl_config.h

CMakeLists.txt

@@ -273,7 +273,7 @@ if(USE_MKLDNN)
  include_directories(3rdparty/mkldnn/include)
  include_directories(${PROJECT_BINARY_DIR}/3rdparty/mkldnn/include)
  add_definitions(-DMXNET_USE_MKLDNN=1)
- list(APPEND mxnet_LINKER_LIBS mkldnn)
+ list(APPEND mxnet_LINKER_LIBS dnnl)
 endif()
 
 # Allow Cuda compiles outside of src tree to find things in 'src' and 'include'

Makefile

@@ -151,7 +151,7 @@ ifeq ($(USE_MKLDNN), 1)
  CFLAGS += -DMXNET_USE_MKLDNN=1
  CFLAGS += -I$(ROOTDIR)/src/operator/nn/mkldnn/
  CFLAGS += -I$(MKLDNNROOT)/include
- LIB_DEP += $(MKLDNNROOT)/lib/libmkldnn.a
+ LIB_DEP += $(MKLDNNROOT)/lib/libdnnl.a
 endif
 
 # setup opencv

cd/mxnet_lib/static/Jenkins_pipeline.groovy

@@ -31,7 +31,7 @@ licenses = 'licenses/*'
 
 // libmxnet dependencies
 mx_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0'
-mx_mkldnn_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/mkldnn_version.h'
+mx_mkldnn_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/dnnl_version.h, 3rdparty/mkldnn/build/install/include/dnnl_config.h'
 
 // library type
 // either static or dynamic - depending on how it links to its dependencies

cd/python/pypi/pypi_package.sh

@@ -26,9 +26,11 @@ export mxnet_variant=${1:?"Please specify the mxnet variant"}
 # mxnet-build/3rdparty/mkldnn/build/install/include
 # The artifact repository stores this file in the dependencies
 # and CD unpacks it to a directory called cd_misc
-if [ -f "cd_misc/mkldnn_version.h" ]; then
+# Nov. 2019 Update: With v1.1, MKL-DNN is renaming to DNNL. Hence changing the prefix of file name. 
+if [ -f "cd_misc/dnnl_version.h" ]; then
  mkdir -p 3rdparty/mkldnn/build/install/include
- cp cd_misc/mkldnn_version.h 3rdparty/mkldnn/build/install/include/.
+ cp cd_misc/dnnl_version.h 3rdparty/mkldnn/build/install/include/.
+ cp cd_misc/dnnl_config.h 3rdparty/mkldnn/build/install/include/.
 fi
 
 # Create wheel workspace

include/mkldnn/dnnl.h

@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl.h

include/mkldnn/dnnl.hpp

@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl.hpp

include/mkldnn/dnnl_types.h

@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_types.h

include/mkldnn/mkldnn.hpp

@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/mkldnn.hpp

include/mkldnn/mkldnn_dnnl_mangling.h

@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/mkldnn_dnnl_mangling.h

include/mkldnn/mkldnn_version.h

@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/mkldnn_version.h

mkldnn.mk

@@ -20,7 +20,7 @@ ifeq ($(USE_MKLDNN), 1)
  MKLDNN_BUILDDIR = $(MKLDNN_SUBMODDIR)/build
  MXNET_LIBDIR = $(ROOTDIR)/lib
  MXNET_INCLDIR = $(ROOTDIR)/include
- MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.a
+ MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libdnnl.a
 endif
 
 mkldnn_FLAGS = -DCMAKE_INSTALL_PREFIX=$(MKLDNNROOT)
@@ -49,10 +49,13 @@ $(MKLDNN_LIBFILE):
  cmake $(MKLDNN_SUBMODDIR) $(mkldnn_FLAGS)
  $(MAKE) -C $(MKLDNN_BUILDDIR) VERBOSE=1
  $(MAKE) -C $(MKLDNN_BUILDDIR) install
- cp $(MKLDNN_BUILDDIR)/include/mkldnn_version.h $(MXNET_INCLDIR)/mkldnn/.
+ cp $(MKLDNN_BUILDDIR)/include/dnnl_version.h $(MXNET_INCLDIR)/mkldnn/.
+ cp $(MKLDNN_BUILDDIR)/include/dnnl_config.h $(MXNET_INCLDIR)/mkldnn/.
 
 mkldnn_clean:
  $(RM) -r 3rdparty/mkldnn/build
+ $(RM) -r include/mkldnn/dnnl_version.h
+ $(RM) -r include/mkldnn/dnnl_config.h
 
 ifeq ($(USE_MKLDNN), 1)
 mkldnn: mkldnn_build