Update of onednn to 2.2 (#31067)

revert-31068-fix_conv3d_windows
Jacek Czaja 4 years ago committed by GitHub
parent 24ba5ee05c
commit d3f09ad702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -20,7 +20,7 @@ SET(MKLDNN_SOURCE_DIR ${THIRD_PARTY_PATH}/mkldnn/src/extern_mkldnn)
SET(MKLDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/mkldnn)
SET(MKLDNN_INC_DIR "${MKLDNN_INSTALL_DIR}/include" CACHE PATH "mkldnn include directory." FORCE)
SET(MKLDNN_REPOSITORY ${GIT_URL}/oneapi-src/oneDNN.git)
SET(MKLDNN_TAG a18f78f1f058437e9efee403655d671633360f98)
SET(MKLDNN_TAG 3d53cd3f17ce7ca365c980f0e1e50359751ca038)
# Introduce variables:
# * CMAKE_INSTALL_LIBDIR

@ -14,6 +14,7 @@
#include "paddle/fluid/framework/data_layout_transform.h"
#include "paddle/fluid/operators/conv_op.h"
#include "paddle/fluid/platform/cpu_info.h"
#include "paddle/fluid/platform/mkldnn_reuse.h"
namespace paddle {
@ -976,8 +977,12 @@ class ConvMKLDNNGradOpKernel : public paddle::framework::OpKernel<T> {
* ('any') which lets a primitive (conv backward in this case) choose
* the memory format preferred for best performance
*/
auto chosen_memory_format = MKLDNNMemoryFormat::any;
// TODO: NHWC is preferred starting from oneDNN 2.1 . Any may crash
auto chosen_memory_format =
platform::MayIUse(platform::cpu_isa_t::avx512_core) &&
is_conv3d == false
? MKLDNNMemoryFormat::nhwc
: MKLDNNMemoryFormat::any;
weights_format = MKLDNNMemoryFormat::any;
auto src_md = platform::MKLDNNMemDesc(

Loading…
Cancel
Save