Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit ca76bf1

Browse files
TaoLvpengzhao-intel
TaoLv
authored and
pengzhao-intel
committed
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
1 parent 436967b commit ca76bf1

File tree

13 files changed

+21
-9
lines changed

13 files changed

+21
-9
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,5 @@ coverage.xml
164164
cmake_options.yml
165165

166166
# header file generated at compile time
167-
include/mkldnn/mkldnn_version.h
167+
include/mkldnn/dnnl_version.h
168+
include/mkldnn/dnnl_config.h

‎3rdparty/mkldnn

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ if(USE_MKLDNN)
273273
include_directories(3rdparty/mkldnn/include)
274274
include_directories(${PROJECT_BINARY_DIR}/3rdparty/mkldnn/include)
275275
add_definitions(-DMXNET_USE_MKLDNN=1)
276-
list(APPEND mxnet_LINKER_LIBS mkldnn)
276+
list(APPEND mxnet_LINKER_LIBS dnnl)
277277
endif()
278278

279279
# Allow Cuda compiles outside of src tree to find things in 'src' and 'include'

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ ifeq ($(USE_MKLDNN), 1)
151151
CFLAGS += -DMXNET_USE_MKLDNN=1
152152
CFLAGS += -I$(ROOTDIR)/src/operator/nn/mkldnn/
153153
CFLAGS += -I$(MKLDNNROOT)/include
154-
LIB_DEP += $(MKLDNNROOT)/lib/libmkldnn.a
154+
LIB_DEP += $(MKLDNNROOT)/lib/libdnnl.a
155155
endif
156156

157157
# setup opencv

‎cd/mxnet_lib/static/Jenkins_pipeline.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ licenses = 'licenses/*'
3131

3232
// libmxnet dependencies
3333
mx_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0'
34-
mx_mkldnn_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/mkldnn_version.h'
34+
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'
3535

3636
// library type
3737
// either static or dynamic - depending on how it links to its dependencies

‎cd/python/pypi/pypi_package.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ export mxnet_variant=${1:?"Please specify the mxnet variant"}
2626
# mxnet-build/3rdparty/mkldnn/build/install/include
2727
# The artifact repository stores this file in the dependencies
2828
# and CD unpacks it to a directory called cd_misc
29-
if [ -f "cd_misc/mkldnn_version.h" ]; then
29+
# Nov. 2019 Update: With v1.1, MKL-DNN is renaming to DNNL. Hence changing the prefix of file name.
30+
if [ -f "cd_misc/dnnl_version.h" ]; then
3031
mkdir -p 3rdparty/mkldnn/build/install/include
31-
cp cd_misc/mkldnn_version.h 3rdparty/mkldnn/build/install/include/.
32+
cp cd_misc/dnnl_version.h 3rdparty/mkldnn/build/install/include/.
33+
cp cd_misc/dnnl_config.h 3rdparty/mkldnn/build/install/include/.
3234
fi
3335

3436
# Create wheel workspace

‎include/mkldnn/dnnl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../3rdparty/mkldnn/include/dnnl.h

‎include/mkldnn/dnnl.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../3rdparty/mkldnn/include/dnnl.hpp

‎include/mkldnn/dnnl_types.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../3rdparty/mkldnn/include/dnnl_types.h

‎include/mkldnn/mkldnn.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../3rdparty/mkldnn/include/mkldnn.hpp

‎include/mkldnn/mkldnn_dnnl_mangling.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../3rdparty/mkldnn/include/mkldnn_dnnl_mangling.h

‎include/mkldnn/mkldnn_version.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../3rdparty/mkldnn/include/mkldnn_version.h

‎mkldnn.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ifeq ($(USE_MKLDNN), 1)
2020
MKLDNN_BUILDDIR = $(MKLDNN_SUBMODDIR)/build
2121
MXNET_LIBDIR = $(ROOTDIR)/lib
2222
MXNET_INCLDIR = $(ROOTDIR)/include
23-
MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.a
23+
MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libdnnl.a
2424
endif
2525

2626
mkldnn_FLAGS = -DCMAKE_INSTALL_PREFIX=$(MKLDNNROOT)
@@ -49,10 +49,13 @@ $(MKLDNN_LIBFILE):
4949
cmake $(MKLDNN_SUBMODDIR) $(mkldnn_FLAGS)
5050
$(MAKE) -C $(MKLDNN_BUILDDIR) VERBOSE=1
5151
$(MAKE) -C $(MKLDNN_BUILDDIR) install
52-
cp $(MKLDNN_BUILDDIR)/include/mkldnn_version.h $(MXNET_INCLDIR)/mkldnn/.
52+
cp $(MKLDNN_BUILDDIR)/include/dnnl_version.h $(MXNET_INCLDIR)/mkldnn/.
53+
cp $(MKLDNN_BUILDDIR)/include/dnnl_config.h $(MXNET_INCLDIR)/mkldnn/.
5354

5455
mkldnn_clean:
5556
$(RM) -r 3rdparty/mkldnn/build
57+
$(RM) -r include/mkldnn/dnnl_version.h
58+
$(RM) -r include/mkldnn/dnnl_config.h
5659

5760
ifeq ($(USE_MKLDNN), 1)
5861
mkldnn: mkldnn_build

0 commit comments

Comments
 (0)