From 9aa875f3f026ec11a871fc0d8f2720176c33c6c2 Mon Sep 17 00:00:00 2001 From: Anton Voronov Date: Thu, 25 Nov 2021 11:23:03 +0300 Subject: [PATCH] [CPU] Migration on oneDNN v2.4.4 --- inference-engine/src/mkldnn_plugin/utils/verbose.cpp | 7 +++++-- inference-engine/thirdparty/mkl-dnn | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/inference-engine/src/mkldnn_plugin/utils/verbose.cpp b/inference-engine/src/mkldnn_plugin/utils/verbose.cpp index 29ddb6524e479e..185c953593112e 100644 --- a/inference-engine/src/mkldnn_plugin/utils/verbose.cpp +++ b/inference-engine/src/mkldnn_plugin/utils/verbose.cpp @@ -10,6 +10,7 @@ #include "dnnl_types.h" #include "dnnl_debug.h" +#include "../src/common/verbose.hpp" #include #include @@ -103,11 +104,13 @@ void Verbose::printInfo() { shift(written); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", prefix.c_str()); shift(written); - written = dnnl_md2fmt_str(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, &desc); + std::string fmt_str = dnnl::impl::md2fmt_str(&desc); + written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", fmt_str.c_str()); shift(written); written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, ":"); shift(written); - written = dnnl_md2dim_str(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, &desc); + std::string dim_str = dnnl::impl::md2dim_str(&desc); + written = snprintf(portsInfo + written_total, CPU_VERBOSE_DAT_LEN - written_total, "%s", dim_str.c_str()); shift(written); }; diff --git a/inference-engine/thirdparty/mkl-dnn b/inference-engine/thirdparty/mkl-dnn index 5adbcb757c77f1..2802fdc94a79e0 160000 --- a/inference-engine/thirdparty/mkl-dnn +++ b/inference-engine/thirdparty/mkl-dnn @@ -1 +1 @@ -Subproject commit 5adbcb757c77f1bf0cd11ad58dd92e93ea2e3561 +Subproject commit 2802fdc94a79e0576d259eeb51f1f562aadcf47a