[1.x][submodule] Upgrade oneDNN to v2.0 (apache#19670)

Zha0q1 · Feb 8, 2021 · 031dc5b · 031dc5b
1 parent 7fba865
commit 031dc5b
Show file tree

Hide file tree

Showing 31 changed files with 38 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -169,5 +169,5 @@ coverage.xml
 cmake_options.yml
 
 # header file generated at compile time
-include/mkldnn/dnnl_version.h
-include/mkldnn/dnnl_config.h
+include/mkldnn/oneapi/dnnl/dnnl_version.h
+include/mkldnn/oneapi/dnnl/dnnl_config.h
diff --git a/3rdparty/mkldnn b/3rdparty/mkldnn
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -815,9 +815,9 @@ endif()
 if(USE_MKLDNN)
     add_custom_command(TARGET mxnet POST_BUILD
       COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/dnnl_config.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/
+      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/oneapi/dnnl/dnnl_config.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/oneapi/dnnl/
       COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/dnnl_version.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/)
+      ${CMAKE_BINARY_DIR}/3rdparty/mkldnn/include/oneapi/dnnl/dnnl_version.h  ${CMAKE_SOURCE_DIR}/include/mkldnn/oneapi/dnnl/)
 endif()
 
 if(USE_INTGEMM)

diff --git a/cd/mxnet_lib/static/Jenkins_pipeline.groovy b/cd/mxnet_lib/static/Jenkins_pipeline.groovy
@@ -33,7 +33,7 @@ licenses = 'licenses/*'
 
 // libmxnet dependencies
 mx_native_deps = 'lib/libgfortran.so.3'
-mx_deps = 'lib/libgfortran.so.3, 3rdparty/mkldnn/build/install/include/dnnl_version.h, 3rdparty/mkldnn/build/install/include/dnnl_config.h'
+mx_deps = 'lib/libgfortran.so.3, 3rdparty/mkldnn/build/install/include/oneapi/dnnl/dnnl_version.h, 3rdparty/mkldnn/build/install/include/oneapi/dnnl/dnnl_config.h'
 
 // library type
 // either static or dynamic - depending on how it links to its dependencies

diff --git a/cd/python/pypi/pypi_package.sh b/cd/python/pypi/pypi_package.sh
@@ -28,9 +28,9 @@ export mxnet_variant=${1:?"Please specify the mxnet variant"}
 # and CD unpacks it to a directory called cd_misc
 # 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/include
-  cp cd_misc/dnnl_version.h 3rdparty/mkldnn/include/.
-  cp cd_misc/dnnl_config.h 3rdparty/mkldnn/include/.
+  mkdir -p 3rdparty/mkldnn/include/oneapi/dnnl
+  cp cd_misc/dnnl_version.h 3rdparty/mkldnn/include/oneapi/dnnl/.
+  cp cd_misc/dnnl_config.h 3rdparty/mkldnn/include/oneapi/dnnl/.
 fi
 
 # Create wheel workspace

diff --git a/include/mkldnn/dnnl_config.h b/include/mkldnn/dnnl_config.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_config.h
diff --git a/include/mkldnn/dnnl_debug.h b/include/mkldnn/dnnl_debug.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_debug.h
diff --git a/include/mkldnn/dnnl_ocl.h b/include/mkldnn/dnnl_ocl.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_ocl.h
diff --git a/include/mkldnn/dnnl_ocl.hpp b/include/mkldnn/dnnl_ocl.hpp
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_ocl.hpp
diff --git a/include/mkldnn/dnnl_sycl.h b/include/mkldnn/dnnl_sycl.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_sycl.h
diff --git a/include/mkldnn/dnnl_sycl.hpp b/include/mkldnn/dnnl_sycl.hpp
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_sycl.hpp
diff --git a/include/mkldnn/dnnl_sycl_types.h b/include/mkldnn/dnnl_sycl_types.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_sycl_types.h
diff --git a/include/mkldnn/dnnl_threadpool.h b/include/mkldnn/dnnl_threadpool.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_threadpool.h
diff --git a/include/mkldnn/dnnl_threadpool.hpp b/include/mkldnn/dnnl_threadpool.hpp
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_threadpool.hpp
diff --git a/include/mkldnn/dnnl_threadpool_iface.hpp b/include/mkldnn/dnnl_threadpool_iface.hpp
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_threadpool_iface.hpp
diff --git a/include/mkldnn/dnnl_version.h b/include/mkldnn/dnnl_version.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/dnnl_version.h
diff --git a/include/mkldnn/mkldnn_config.h b/include/mkldnn/mkldnn_config.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/mkldnn_config.h
diff --git a/include/mkldnn/mkldnn_debug.h b/include/mkldnn/mkldnn_debug.h
@@ -0,0 +1 @@
+../../3rdparty/mkldnn/include/mkldnn_debug.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl.h b/include/mkldnn/oneapi/dnnl/dnnl.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl.hpp b/include/mkldnn/oneapi/dnnl/dnnl.hpp
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl.hpp
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_debug.h b/include/mkldnn/oneapi/dnnl/dnnl_debug.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_debug.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_ocl.h b/include/mkldnn/oneapi/dnnl/dnnl_ocl.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_ocl.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_ocl.hpp b/include/mkldnn/oneapi/dnnl/dnnl_ocl.hpp
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_ocl.hpp
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_sycl.h b/include/mkldnn/oneapi/dnnl/dnnl_sycl.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_sycl.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_sycl.hpp b/include/mkldnn/oneapi/dnnl/dnnl_sycl.hpp
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_sycl.hpp
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_sycl_types.h b/include/mkldnn/oneapi/dnnl/dnnl_sycl_types.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_sycl_types.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_threadpool.h b/include/mkldnn/oneapi/dnnl/dnnl_threadpool.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_threadpool.h
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_threadpool.hpp b/include/mkldnn/oneapi/dnnl/dnnl_threadpool.hpp
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_threadpool.hpp
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_threadpool_iface.hpp b/include/mkldnn/oneapi/dnnl/dnnl_threadpool_iface.hpp
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_threadpool_iface.hpp
diff --git a/include/mkldnn/oneapi/dnnl/dnnl_types.h b/include/mkldnn/oneapi/dnnl/dnnl_types.h
@@ -0,0 +1 @@
+../../../../3rdparty/mkldnn/include/oneapi/dnnl/dnnl_types.h
diff --git a/mkldnn.mk b/mkldnn.mk
@@ -50,13 +50,13 @@ $(MKLDNN_LIBFILE):
 	cmake $(MKLDNN_SUBMODDIR) $(mkldnn_FLAGS)
 	$(MAKE) -C $(MKLDNN_BUILDDIR) VERBOSE=1
 	$(MAKE) -C $(MKLDNN_BUILDDIR) install
-	cp $(MKLDNN_BUILDDIR)/include/dnnl_version.h $(MXNET_INCLDIR)/mkldnn/.
-	cp $(MKLDNN_BUILDDIR)/include/dnnl_config.h $(MXNET_INCLDIR)/mkldnn/.
+	cp $(MKLDNN_BUILDDIR)/include/oneapi/dnnl/dnnl_version.h $(MXNET_INCLDIR)/mkldnn/oneapi/dnnl/.
+	cp $(MKLDNN_BUILDDIR)/include/oneapi/dnnl/dnnl_config.h $(MXNET_INCLDIR)/mkldnn/oneapi/dnnl/.
 
 mkldnn_clean:
 	$(RM) -r 3rdparty/mkldnn/build
-	$(RM) -r include/mkldnn/dnnl_version.h
-	$(RM) -r include/mkldnn/dnnl_config.h
+	$(RM) -r include/mkldnn/oneapi/dnnl/dnnl_version.h
+	$(RM) -r include/mkldnn/oneapi/dnnl/dnnl_config.h
 
 ifeq ($(USE_MKLDNN), 1)
 mkldnn: mkldnn_build