Skip to content

Commit

Permalink
Upgrade oneDNN (mkl-dnn) to v1.7 (#47853)
Browse files Browse the repository at this point in the history
Summary:
Bump oneDNN (mkl-dnn) to 1.7 for bug fixes and performance optimizations
- Fixes #42115. Fixed build issue on Windows for the case when oneDNN is built as submodule
- Fixes #45746. Fixed segmentation fault for convolution weight gradient on systems with Intel AVX512 support

This PR also contains a few changes in ideep for follow-up update (not enabled in current PR yet):
- Performance improvements for the CPU path of Convolution
- Channel-last support

Pull Request resolved: #47853

Reviewed By: bdhirsh

Differential Revision: D25275268

Pulled By: VitalyFedyunin

fbshipit-source-id: 75a589d57e3d19a7f23272a67045ad7494f1bdbe
  • Loading branch information
pinzhenx authored and facebook-github-bot committed Dec 3, 2020
1 parent 47aa253 commit 1eed54d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ if "%REBUILD%"=="" (
7z x -aoa %TMP_DIR_WIN%\mkl.7z -o%TMP_DIR_WIN%\mkl
)
set CMAKE_INCLUDE_PATH=%TMP_DIR_WIN%\mkl\include
set LIB=%TMP_DIR_WIN%\mkl\lib;%LIB
set LIB=%TMP_DIR_WIN%\mkl\lib;%LIB%
2 changes: 1 addition & 1 deletion aten/src/ATen/native/CompositeRandomAccessorCommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class CompositeRandomAccessor {

// Pointer-like operations {
C10_HOST_DEVICE
reference operator*() {
reference operator*() const {
return TupleInfo::tie(*keys, *values);
}

Expand Down
2 changes: 1 addition & 1 deletion caffe2/ideep/ideep_utils.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <caffe2/core/macros.h> // For caffe2 macros.

#include <caffe2/utils/eigen_utils.h>
// All caffe2 ideep related headers
#include <ideep.hpp>
#include <caffe2/ideep/utils/ideep_context.h>
Expand Down
9 changes: 6 additions & 3 deletions third_party/mkl-dnn.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ template_rule(
out = "include/dnnl_version.h",
substitutions = {
"@DNNL_VERSION_MAJOR@": "1",
"@DNNL_VERSION_MINOR@": "5",
"@DNNL_VERSION_MINOR@": "7",
"@DNNL_VERSION_PATCH@": "0",
"@DNNL_VERSION_HASH@": "e2ac1fac44c5078ca927cb9b90e1b3066a0b2ed0",
"@DNNL_VERSION_HASH@": "2e4732679f0211bb311780d0f383cf2dce9baca7",
},
)

Expand All @@ -30,6 +30,8 @@ cc_library(
srcs = glob([
"src/common/*.cpp",
"src/cpu/**/*.cpp",
], exclude=[
"src/cpu/aarch64/*.cpp",
]),
hdrs = glob([
"include/*.h",
Expand All @@ -38,7 +40,8 @@ cc_library(
"src/cpu/**/*.hpp",
"src/cpu/**/*.h",
"src/common/*.hpp",
"src/cpu/rnn/*.hpp",
], exclude=[
"src/cpu/aarch64/*.hpp",
]) + [
"include/dnnl_version.h",
"include/dnnl_config.h",
Expand Down
2 changes: 1 addition & 1 deletion torch/csrc/python_headers.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once

#include <math.h>
// workaround for Python 2 issue: https://bugs.python.org/issue17120
// NOTE: It looks like this affects Python 3 as well.
#pragma push_macro("_XOPEN_SOURCE")
Expand Down

0 comments on commit 1eed54d

Please sign in to comment.