Merge branch 'master' into gauri/macos_cast

cmake/external_mkldnn.cmake

@@ -18,10 +18,10 @@ include(ExternalProject)
 
 # Includes blas 3.8.0 in mkldnn
 set(NGRAPH_MKLDNN_SHORT_VERSION 0)
-set(NGRAPH_MKLDNN_FULL_VERSION 0.19.0.0)
-set(NGRAPH_MKLDNN_VERSION "v0.19")
+set(NGRAPH_MKLDNN_FULL_VERSION 0.20.0.0)
+set(NGRAPH_MKLDNN_VERSION "v0.20")
 set(NGRAPH_MKLDNN_SUB_VERSION "2019.0.5.20190502")
-set(NGRAPH_MKLDNN_GIT_TAG "027de76")
+set(NGRAPH_MKLDNN_GIT_TAG "v0.20")
 
 #------------------------------------------------------------------------------
 # Fetch and install MKL-DNN

cmake/mkldnn.patch

@@ -28,16 +28,3 @@ index f10feb20..05f47961 100644
  set_property(TARGET ${LIB_NAME} PROPERTY PUBLIC_HEADER ${HEADERS})
  
  target_include_directories(${LIB_NAME} PUBLIC
-diff --git a/src/cpu/jit_avx512_common_conv_kernel.cpp b/src/cpu/jit_avx512_common_conv_kernel.cpp
-index 1bb98fa43..b8b54401f 100644
---- a/src/cpu/jit_avx512_common_conv_kernel.cpp
-+++ b/src/cpu/jit_avx512_common_conv_kernel.cpp
-@@ -3055,7 +3055,7 @@ void jit_avx512_common_conv_bwd_weights_kernel_f32::bias_kernel_3d() {
- void jit_avx512_common_conv_bwd_weights_kernel_f32
-     ::compute_oh_loop_common()
- {
--    assert(jcp.harness == harness_mb_reduction);
-+    assert(one_of(jcp.harness, harness_mb_reduction, harness_3d_reduction));
-     int b_pad = jcp.b_pad;
-     int t_pad = jcp.t_pad;
-     bool is_dilated = jcp.dilate_h != 0;