Static link MKL-DNN library

CMakeLists.txt

@@ -258,15 +258,15 @@ endif()
 if(USE_MKLDNN)
   # CPU architecture (e.g., C5) can't run on another architecture (e.g., g3).
   if(MSVC)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /Gy")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHsc /MT")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /Gy /MT")
   endif()
 
   set(MKLDNN_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
   set(MKLDNN_BUILD_EXAMPLES OFF CACHE INTERNAL "" FORCE)
   set(MKLDNN_ARCH_OPT_FLAGS "" CACHE INTERNAL "" FORCE)
-  set(MKLDNN_USE_MKL NONE CACHE INTERNAL "" FORCE)
   set(MKLDNN_ENABLE_JIT_PROFILING OFF CACHE INTERNAL "" FORCE)
+  set(MKLDNN_LIBRARY_TYPE STATIC CACHE INTERNAL "" FORCE)
 
   add_subdirectory(3rdparty/mkldnn)
 

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
-	LDFLAGS += -L$(MKLDNNROOT)/lib -L$(MKLDNNROOT)/lib64 -lmkldnn -Wl,-rpath,'$${ORIGIN}'
+	LIB_DEP += $(MKLDNNROOT)/lib/libmkldnn.a
 endif
 
 # setup opencv
@@ -595,11 +595,6 @@ lib/libmxnet.so: $(ALLX_DEP)
 	@mkdir -p $(@D)
 	$(CXX) $(CFLAGS) -shared -o $@ $(filter-out %libnnvm.a, $(filter %.o %.a, $^)) $(LDFLAGS) \
 	-Wl,${WHOLE_ARCH} $(filter %libnnvm.a, $^) -Wl,${NO_WHOLE_ARCH}
-ifeq ($(USE_MKLDNN), 1)
-ifeq ($(UNAME_S), Darwin)
-	install_name_tool -change '@rpath/libmkldnn.1.dylib' '@loader_path/libmkldnn.1.dylib' $@
-endif
-endif
 
 $(PS_PATH)/build/libps.a: PSLITE
 
@@ -689,10 +684,6 @@ rpkg:
 	cp src/io/image_recordio.h R-package/src
 	cp -rf lib/libmxnet.so R-package/inst/libs
 
-	if [ -e "lib/libmkldnn.so.1" ]; then \
-		cp -rf lib/libmkldnn.so.1 R-package/inst/libs; \
-	fi
-
 	if [ -e "lib/libtvm_runtime.so" ]; then \
 		cp -rf lib/libtvm_runtime.so R-package/inst/libs; \
 	fi

cd/mxnet_lib/dynamic/Jenkins_pipeline.groovy

@@ -30,7 +30,6 @@ licenses = 'licenses/*'
 
 // libmxnet dependencies
 mx_deps = ''
-mx_mkldnn_deps = 'lib/libmkldnn.so.1'
 
 // library type
 // either static or dynamic - depending on how it links to its dependencies

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, lib/libmkldnn.so.1, 3rdparty/mkldnn/build/install/include/mkldnn_version.h'
+mx_mkldnn_deps = 'lib/libgfortran.so.3, lib/libquadmath.so.0, 3rdparty/mkldnn/build/install/include/mkldnn_version.h'
 
 // library type
 // either static or dynamic - depending on how it links to its dependencies

ci/docker/runtime_functions.sh

@@ -878,9 +878,6 @@ build_ubuntu_gpu_cmake_mkldnn() {
         /work/mxnet
 
     ninja -v
-    # libmkldnn.so.1 is a link file. We need an actual binary file named libmkldnn.so.1.
-    cp 3rdparty/mkldnn/src/libmkldnn.so.1 3rdparty/mkldnn/src/libmkldnn.so.1.tmp
-    mv 3rdparty/mkldnn/src/libmkldnn.so.1.tmp 3rdparty/mkldnn/src/libmkldnn.so.1
 }
 
 build_ubuntu_gpu_cmake() {

ci/jenkins/Jenkins_steps.groovy

@@ -35,8 +35,8 @@ mx_cmake_lib_no_tvm_op = 'build/libmxnet.so, build/libmxnet.a, build/libsample_l
 mx_cmake_lib_cython = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'
 // mxnet cmake libraries, in cmake builds we do not produce a libnvvm static library by default.
 mx_cmake_lib_debug = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/libsample_lib.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests'
-mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so, build/3rdparty/mkldnn/src/libmkldnn.so.1'
-mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, libsample_lib.so, lib/libmkldnn.so.1, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
+mx_cmake_mkldnn_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
+mx_mkldnn_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
 mx_tensorrt_lib = 'build/libmxnet.so, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/tvmop.conf, lib/libnvonnxparser_runtime.so.0, lib/libnvonnxparser.so.0, lib/libonnx_proto.so, lib/libonnx.so'
 mx_lib_cpp_examples = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, lib/tvmop.conf, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'
 mx_lib_cpp_examples_no_tvm_op = 'lib/libmxnet.so, lib/libmxnet.a, libsample_lib.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, 3rdparty/ps-lite/build/libps.a, deps/lib/libprotobuf-lite.a, deps/lib/libzmq.a, build/cpp-package/example/*, python/mxnet/_cy2/*.so, python/mxnet/_cy3/*.so'

mkldnn.mk

@@ -20,11 +20,24 @@ ifeq ($(USE_MKLDNN), 1)
 	MKLDNN_BUILDDIR = $(MKLDNN_SUBMODDIR)/build
 	MXNET_LIBDIR = $(ROOTDIR)/lib
 	MXNET_INCLDIR = $(ROOTDIR)/include
-ifeq ($(UNAME_S), Darwin)
-	MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.1.dylib
-else
-	MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.so.1
+	MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.a
 endif
+
+mkldnn_FLAGS  = -DCMAKE_INSTALL_PREFIX=$(MKLDNNROOT)
+mkldnn_FLAGS += -DCMAKE_INSTALL_LIBDIR=lib
+mkldnn_FLAGS += -B$(MKLDNN_BUILDDIR)
+mkldnn_FLAGS += -DMKLDNN_ARCH_OPT_FLAGS=""
+mkldnn_FLAGS += -DMKLDNN_BUILD_TESTS=OFF
+mkldnn_FLAGS += -DMKLDNN_BUILD_EXAMPLES=OFF
+mkldnn_FLAGS += -DMKLDNN_ENABLE_JIT_PROFILING=OFF
+mkldnn_FLAGS += -DMKLDNN_LIBRARY_TYPE=STATIC
+
+ifneq ($(USE_OPENMP), 1)
+	mkldnn_FLAGS += -DMKLDNN_CPU_RUNTIME=SEQ
+endif
+
+ifeq ($(DEBUG), 1)
+	mkldnn_FLAGS += -DCMAKE_BUILD_TYPE=Debug
 endif
 
 .PHONY: mkldnn mkldnn_clean
@@ -33,11 +46,9 @@ mkldnn_build: $(MKLDNN_LIBFILE)
 
 $(MKLDNN_LIBFILE):
 	mkdir -p $(MKLDNNROOT)/lib
-	cmake $(MKLDNN_SUBMODDIR) -DCMAKE_INSTALL_PREFIX=$(MKLDNNROOT) -DCMAKE_INSTALL_LIBDIR=lib -B$(MKLDNN_BUILDDIR) -DMKLDNN_ARCH_OPT_FLAGS="" -DMKLDNN_BUILD_TESTS=OFF -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_ENABLE_JIT_PROFILING=OFF
+	cmake $(MKLDNN_SUBMODDIR) $(mkldnn_FLAGS)
 	$(MAKE) -C $(MKLDNN_BUILDDIR) VERBOSE=1
 	$(MAKE) -C $(MKLDNN_BUILDDIR) install
-	mkdir -p $(MXNET_LIBDIR)
-	cp $(MKLDNN_LIBFILE) $(MXNET_LIBDIR)
 	cp $(MKLDNN_BUILDDIR)/include/mkldnn_version.h $(MXNET_INCLDIR)/mkldnn/.
 
 mkldnn_clean:

scala-package/assembly/src/main/assembly/assembly.xml

@@ -57,8 +57,6 @@
         <include>libtvm_runtime.so</include>
         <include>libgfortran.so.3</include>
         <include>libquadmath.so.0</include>
-        <include>libmkldnn.so.1</include>
-        <include>libmkldnn.1.dylib</include>
       </includes>
       <outputDirectory>lib/native</outputDirectory>
     </fileSet>

scala-package/core/src/main/scala/org/apache/mxnet/util/NativeLibraryLoader.scala

@@ -89,8 +89,6 @@ private[mxnet] object NativeLibraryLoader {
     saveLibraryToTemp("libtvm_runtime.so", "/lib/native/libtvm_runtime.so", false)
     saveLibraryToTemp("libgfortran.so.3", "/lib/native/libgfortran.so.3", false)
     saveLibraryToTemp("libquadmath.so.0", "/lib/native/libquadmath.so.0", false)
-    saveLibraryToTemp("libmkldnn.so.1", "/lib/native/libmkldnn.so.1", false)
-    saveLibraryToTemp("libmkldnn.1.dylib", "/lib/native/libmkldnn.1.dylib", false)
     val tempfile: File = saveLibraryToTemp(libname, libFileInJar, true)
 
     loadLibraryFromFile(libname, tempfile)

tests/nightly/JenkinsfileForBinaries

@@ -20,7 +20,7 @@
 
 mx_lib = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a'
 mx_cmake_lib = 'build/libmxnet.so, build/libmxnet.a, build/3rdparty/tvm/libtvm_runtime.so, build/libtvmop.so, build/3rdparty/dmlc-core/libdmlc.a, build/tests/mxnet_unit_tests, build/3rdparty/openmp/runtime/src/libomp.so'
-mx_lib_cpp_example_mkl = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, build/cpp-package/example/imagenet_inference, lib/libmkldnn.so.1'
+mx_lib_cpp_example_mkl = 'lib/libmxnet.so, lib/libmxnet.a, lib/libtvm_runtime.so, lib/libtvmop.so, 3rdparty/dmlc-core/libdmlc.a, 3rdparty/tvm/nnvm/lib/libnnvm.a, build/cpp-package/example/imagenet_inference'
 
 node('utility') {
   // Loading the utilities requires a node context unfortunately

tests/python/mkl/test_mkldnn.py

@@ -28,7 +28,6 @@
 from mxnet import gluon
 from mxnet.gluon import nn
 from mxnet.test_utils import *
-import test_mkldnn_install as install
 curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
 sys.path.append(os.path.join(curr_path, '../unittest/'))
 from common import with_seed
@@ -637,4 +636,5 @@ def check_elemwise_add_training(stype):
         check_elemwise_add_training(stype)
 
 if __name__ == '__main__':
-    install.test_mkldnn_install()
+    import nose
+    nose.runmodule()

tools/pip/setup.py

@@ -147,11 +147,6 @@ def has_ext_modules(self):
                 'dmlc_tracker': []}
 if variant.endswith('MKL'):
     if platform.system() == 'Darwin':
-        shutil.copy(os.path.join(os.path.dirname(LIB_PATH[0]), 'libmkldnn.1.dylib'), os.path.join(CURRENT_DIR, 'mxnet'))
-        package_data['mxnet'].append('mxnet/libmkldnn.1.dylib')
-    else:
-        shutil.copy(os.path.join(os.path.dirname(LIB_PATH[0]), 'libmkldnn.so.1'), os.path.join(CURRENT_DIR, 'mxnet'))
-        package_data['mxnet'].append('mxnet/libmkldnn.so.1')
     shutil.copytree(os.path.join(CURRENT_DIR, 'mxnet-build/3rdparty/mkldnn/build/install/include'),
                     os.path.join(CURRENT_DIR, 'mxnet/include/mkldnn'))
 if platform.system() == 'Linux':

tools/staticbuild/build_lib.sh

@@ -34,16 +34,7 @@ $MAKE DEPS_PATH=$DEPS_PATH $PWD/3rdparty/tvm/nnvm/lib/libnnvm.a
 $MAKE DEPS_PATH=$DEPS_PATH PSLITE
 
 if [[ $VARIANT == *mkl ]]; then
-    if [[ $PLATFORM == 'linux' ]]; then
-        MKLDNN_LIBFILE='libmkldnn.so.1'
-    else
-        MKLDNN_LIBFILE='libmkldnn.1.dylib'
-    fi
     $MAKE DEPS_PATH=$DEPS_PATH mkldnn
-    if [ ! -d lib ]; then
-        mkdir lib
-    fi
-    cp 3rdparty/mkldnn/build/install/lib/$MKLDNN_LIBFILE lib
 fi
 
 >&2 echo "Now building mxnet..."