mkldnn.patch 1.8 KB
Newer Older
1
diff --git a/cmake/OpenMP.cmake b/cmake/OpenMP.cmake
2
index 71ff59ae..aea7d3fa 100644
3 4
--- a/cmake/OpenMP.cmake
+++ b/cmake/OpenMP.cmake
5
@@ -31,7 +31,7 @@ if (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
6 7 8 9 10 11 12 13 14
     # But we still want to build the library.
     set(_omp_severity "WARNING")
 else()
-    set(_omp_severity "FATAL_ERROR")
+    set(_omp_severity "WARNING")
 endif()
 
 macro(forbid_link_compiler_omp_rt)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
15
index f10feb20..05f47961 100644
16 17
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
18 19 20 21 22 23
@@ -92,8 +92,10 @@ endif()
 add_library(${LIB_NAME} ${MKLDNN_LIBRARY_TYPE} ${HEADERS} ${SOURCES})
 set_property(TARGET ${LIB_NAME} PROPERTY CXX_STANDARD 11)
 set_property(TARGET ${LIB_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
-set_property(TARGET ${LIB_NAME} PROPERTY VERSION "${PROJECT_VERSION}.0")
-set_property(TARGET ${LIB_NAME} PROPERTY SOVERSION "0")
24
+if(MKLDNN_LIB_VERSIONING_ENABLE)
25 26
+    set_property(TARGET ${LIB_NAME} PROPERTY VERSION "${PROJECT_VERSION}.0")
+    set_property(TARGET ${LIB_NAME} PROPERTY SOVERSION "0")
27
+endif()
28
 set_property(TARGET ${LIB_NAME} PROPERTY PUBLIC_HEADER ${HEADERS})
29
 
30
 target_include_directories(${LIB_NAME} PUBLIC
31 32 33 34 35 36 37 38 39 40 41 42 43
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;