mirror of
https://github.com/saymrwulf/onnxruntime.git
synced 2026-06-06 00:03:22 +00:00
69baf9e800
* Update nGraph to 0.21 and adjust the EP * Share the graph initializers between custom ops * Update nGraph to 0.22 and exclude Gather entirely * Enable building on Windows with nGraph v0.21.1-rc.0 * Disable the unsigned input Shrink op tests for nGraph until the next update * Line-shortening code refactor * Fix for the master branch merge artifact * MKLDNN patches adjustment for Windows * Exclude MatMulInteger for non-const zero points * Exclude ConvInteger for non-const zero points * Enable full Cast op support * Use the v0.22.1 tag * Skip ConvTranspose_InvalidKernelShape test for ngraph provider * Create sub-graph ModelProto from fused_node
64 lines
2.6 KiB
Diff
64 lines
2.6 KiB
Diff
cmake/external_mkldnn.cmake | 1 +
|
|
cmake/mkldnn_fix_missing_symbol.patch | 99 +++++++++++++++++++++++++++++++++++
|
|
2 files changed, 100 insertions(+)
|
|
create mode 100644 cmake/mkldnn_fix_missing_symbol.patch
|
|
|
|
diff --git a/cmake/external_mkldnn.cmake b/cmake/external_mkldnn.cmake
|
|
index 7874aca76..bbae6d1a4 100644
|
|
--- a/cmake/external_mkldnn.cmake
|
|
+++ b/cmake/external_mkldnn.cmake
|
|
@@ -194,7 +194,8 @@ if (WIN32)
|
|
CONFIGURE_COMMAND
|
|
PATCH_COMMAND ${MKLDNN_PATCH_REVERT_COMMAND}
|
|
COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/${MKLDNN_PATCH_FILE}
|
|
COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/mkldnn_fix_memory.patch
|
|
+ COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/cmake/mkldnn_fix_missing_symbol.patch
|
|
CMAKE_GENERATOR ${CMAKE_GENERATOR}
|
|
CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
|
|
CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
|
|
diff --git a/cmake/mkldnn_fix_missing_symbol.patch b/cmake/mkldnn_fix_missing_symbol.patch
|
|
new file mode 100644
|
|
index 000000000..ea1a3bd61
|
|
--- /dev/null
|
|
+++ b/cmake/mkldnn_fix_missing_symbol.patch
|
|
@@ -0,0 +1,40 @@
|
|
+commit d485a54ac2b07b7349dabd833961415315a18fea
|
|
+Author: Denis Samoilov <denis.samoylov@intel.com>
|
|
+Date: Sun Apr 14 20:11:33 2019 -0700
|
|
+
|
|
+ cpu: gemv: fix unresolved symbol
|
|
+
|
|
+ Fixes #456
|
|
+
|
|
+diff --git a/src/cpu/gemm/gemm_driver.cpp b/src/cpu/gemm/gemm_driver.cpp
|
|
+index 0773b212..df7bc44d 100644
|
|
+--- a/src/cpu/gemm/gemm_driver.cpp
|
|
++++ b/src/cpu/gemm/gemm_driver.cpp
|
|
+@@ -1304,10 +1304,8 @@ static mkldnn_status_t gemm_threading_driver(
|
|
+ (float *) arg->co);
|
|
+ }
|
|
+
|
|
+- if (data_traits<a_type>::data_type == data_type::s8) {
|
|
+- if (gemm_s8u8s32_jump_to_gemv_s8u8s32(arg)) {
|
|
+- return mkldnn_success;
|
|
+- }
|
|
++ if (gemm_s8u8s32_jump_to_gemv_s8u8s32(arg)) {
|
|
++ return mkldnn_success;
|
|
+ }
|
|
+
|
|
+ int nthr = (mkldnn_in_parallel()) ? 1 : mkldnn_get_max_threads();
|
|
+diff --git a/src/cpu/gemm/s8x8s32/jit_avx512_core_gemv_s8u8s32.cpp b/src/cpu/gemm/s8x8s32/jit_avx512_core_gemv_s8u8s32.cpp
|
|
+index 73d50e40..81646a43 100644
|
|
+--- a/src/cpu/gemm/s8x8s32/jit_avx512_core_gemv_s8u8s32.cpp
|
|
++++ b/src/cpu/gemm/s8x8s32/jit_avx512_core_gemv_s8u8s32.cpp
|
|
+@@ -29,6 +29,10 @@ namespace cpu {
|
|
+ template <typename T>
|
|
+ int gemm_s8u8s32_jump_to_gemv_s8u8s32(T *arg);
|
|
+
|
|
++template <>
|
|
++int gemm_s8u8s32_jump_to_gemv_s8u8s32(
|
|
++ gemm_info_t<float, float, float> *arg) { return 0; }
|
|
++
|
|
+ template <>
|
|
+ int gemm_s8u8s32_jump_to_gemv_s8u8s32(
|
|
+ gemm_info_t<int8_t, uint8_t, int32_t> *arg) {
|