From c2448d60f8de0b5aa36bb80cfe945a6e2dda6b7e Mon Sep 17 00:00:00 2001 From: Maksim Kutakov Date: Wed, 12 May 2021 12:09:11 +0300 Subject: [PATCH] Fixes after review --- inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp | 2 +- inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp | 2 +- .../plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp index 12b6ef97aa4984..86820c88ce405a 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_graph.cpp @@ -748,7 +748,7 @@ void MKLDNNGraph::PullOutputData(const BlobMap &out) { const MKLDNNMemory& intr_blob = node->getParentEdgeAt(0)->getMemory(); if (!out.count(name)) { - continue; + IE_THROW(Unexpected) << "The network outputs do not contain mkldnn graph output node name: \"" << name << "\""; } const Blob::Ptr &ext_blob = out.at(name); diff --git a/inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp b/inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp index 88d9a6174da1ef..392226d06d4eba 100644 --- a/inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp +++ b/inference-engine/src/mkldnn_plugin/mkldnn_infer_request.cpp @@ -251,7 +251,7 @@ InferenceEngine::Blob::Ptr MKLDNNPlugin::MKLDNNInferRequest::GetBlob(const std:: if (_outputs.find(name) == _outputs.end()) { if (!data) { InferenceEngine::TensorDesc desc = _networkOutputs[name]->getTensorDesc(); - desc.setPrecision(normalizeToSupportedPrecision(desc.getPrecision())); + desc.setPrecision(normalizeToSupportedPrecision(desc.getPrecision())); // WA: need to avoid exception thrown when we compare blocking desc in SetBlob // in situation if we push output blobs as inputs for next network (in Hetero plugin) diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp index 108294f53f220b..65ac992ec76ac1 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp @@ -20,6 +20,7 @@ class ParameterResultCustomBlobTest : public ParameterResultSubgraphTest { auto inputBlob = inputs.front(); const size_t elementsCount = inputBlob->size(); for (size_t i = 0; i < inferIterations; ++i) { + CommonTestUtils::fill_data_random(inputBlob, 10, 0, 1, i); const auto& inputsInfo = cnnNetwork.getInputsInfo().begin()->second; std::string inputName = cnnNetwork.getInputsInfo().begin()->first;