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

Update 3rdparty/mkldnn to v1.2.2 #17313

Merged
szha merged 29 commits into from
Mar 20, 2020
Merged

Update 3rdparty/mkldnn to v1.2.2 #17313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e252dd8
update to dnnl v1.2-rc
TaoLv Jan 15, 2020
2debc3c
fix cpp test
TaoLv Jan 15, 2020
e3df4b6
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 16, 2020
ab506bc
pin rls-v1.2
TaoLv Jan 17, 2020
906b491
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 17, 2020
fae5ff8
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 21, 2020
d3e586a
build dnnl with DNNL_ENABLE_CONCURRENT_EXEC=ON
TaoLv Jan 21, 2020
a44c45e
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 22, 2020
f4061f4
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 26, 2020
4f91f0d
update rls-v1.2
TaoLv Jan 26, 2020
63566bb
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 1, 2020
1ad154b
update to formal 1.2 release
TaoLv Feb 1, 2020
4288512
try patch
TaoLv Feb 5, 2020
77d8e3b
fix rnn
TaoLv Feb 5, 2020
302eec4
pin rls-v1.2
TaoLv Feb 11, 2020
fb0efbd
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 11, 2020
29fafdc
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 12, 2020
8be96cb
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 15, 2020
698c7c9
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 26, 2020
28da6a1
dnnl v1.2.1
TaoLv Feb 26, 2020
c7021a6
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 27, 2020
19eea25
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 27, 2020
745a610
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 29, 2020
71f3de7
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Mar 2, 2020
f82b7f9
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Mar 4, 2020
eac3275
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Mar 9, 2020
8370dd5
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Mar 13, 2020
b9d2192
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Mar 19, 2020
f809527
dnnl v1.2.2
TaoLv Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
[submodule "3rdparty/mkldnn"]
path = 3rdparty/mkldnn
url = https://github.com/intel/mkl-dnn.git
branch = master
[submodule "3rdparty/tvm"]
path = 3rdparty/tvm
url = https://github.com/apache/incubator-tvm.git
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/mkldnn
Open in desktop
Submodule mkldnn updated from cb2cc7 to 8e96ef
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ if(USE_MKLDNN)
set(MKLDNN_ARCH_OPT_FLAGS "" CACHE INTERNAL "" FORCE)
set(MKLDNN_ENABLE_JIT_PROFILING OFF CACHE INTERNAL "" FORCE)
set(MKLDNN_LIBRARY_TYPE STATIC CACHE INTERNAL "" FORCE)
set(DNNL_ENABLE_CONCURRENT_EXEC ON CACHE INTERNAL "" FORCE)

if(NOT USE_OPENMP)
set(MKLDNN_CPU_RUNTIME SEQ CACHE INTERNAL "" FORCE)
Expand Down
1 change: 1 addition & 0 deletions mkldnn.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ 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
mkldnn_FLAGS += -DDNNL_ENABLE_CONCURRENT_EXEC=ON

ifneq ($(USE_OPENMP), 1)
mkldnn_FLAGS += -DMKLDNN_CPU_RUNTIME=SEQ
Expand Down
2 changes: 1 addition & 1 deletion tests/cpp/operator/mkldnn_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static void VerifyDefMem(const mkldnn::memory &mem) {

TEST(MKLDNN_UTIL_FUNC, MemFormat) {
// Check whether the number of format is correct.
CHECK_EQ(mkldnn_format_tag_last, 131);
CHECK_EQ(mkldnn_format_tag_last, 152);
Copy link
Copy Markdown
Contributor

@ciyongch ciyongch Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where can we get this number? Or do we need to calculate this number manually when upgrading to a new version of DNNL?

Copy link
Copy Markdown
Member Author

@TaoLv TaoLv Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need print this flag in cpp to get the value. This test was design to notify us if there are new formats added to dnnl so we need carefully check if these new formats break any integration code or the integration code need be improved to handle them.

CHECK_EQ(mkldnn_nchw, 5);
CHECK_EQ(mkldnn_oihw, 5);
}
Expand Down