[VPU]Fix for crash in Myriad plugin during LoadNetwork with Hetero pl…

…ugin
openvinotoolkit · May 5, 2021 · 042abce · 042abce
1 parent 29a8be5
commit 042abce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/inference-engine/src/vpu/common/src/ngraph/query_network.cpp b/inference-engine/src/vpu/common/src/ngraph/query_network.cpp
@@ -66,13 +66,11 @@ InferenceEngine::QueryNetworkResult getQueryNetwork(const InferenceEngine::CNNNe
         }
     }
 
-    for (const auto& layerName : supported) {
+    for (const auto& layerName : unsupported) {
         if (supported.empty()) {
             break;
         }
-        if (InferenceEngine::details::contains(unsupported, layerName)) {
-            supported.erase(layerName);
-        }
+        supported.erase(layerName);
     }
 
     unsupported.clear();

diff --git a/inference-engine/thirdparty/mkl-dnn b/inference-engine/thirdparty/mkl-dnn
+3 −6		src/common/math_utils.hpp
+1 −1		src/cpu/cpu_rnn_list.cpp
+119 −122		src/cpu/x64/gemm/gemm_info.cpp
+2 −1		src/cpu/x64/jit_gemm_inner_product_utils.cpp
+150 −26		src/cpu/x64/jit_uni_eltwise_injector.cpp
+0 −1		src/cpu/x64/jit_uni_eltwise_injector.hpp
+1 −1		tests/gtests/test_eltwise.cpp