[GNA] Fix KW issues (openvinotoolkit#3)

tadamowicz · Jan 22, 2020 · d44d651 · d44d651
1 parent 1adce8c
commit d44d651
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/inference-engine/src/gna_plugin/gna_graph_compiler.cpp b/inference-engine/src/gna_plugin/gna_graph_compiler.cpp
@@ -1306,6 +1306,7 @@ void GNAGraphCompiler::PermutePrimitive(InferenceEngine::CNNLayerPtr layer) {
     }
 
     if (layerOrder == vector<int>({1, 0, 2})) {
+        IE_ASSERT(!layer->insData.empty());
         auto inputs = layer->insData.begin()->lock();
         auto inputs_size = inputs->getTensorDesc().getDims().size();
         if (inputs_size != layerOrder.size()) {

diff --git a/inference-engine/src/gna_plugin/gna_plugin.cpp b/inference-engine/src/gna_plugin/gna_plugin.cpp
@@ -1014,6 +1014,7 @@ void GNAPlugin::Infer(const InferenceEngine::Blob &input, InferenceEngine::Blob
 
     IE_ASSERT(!inputsDataMap.empty());
     bmInput[inputsDataMap.begin()->first] = std::shared_ptr<Blob>(const_cast<Blob*>(&input), [](Blob*){});
+    IE_ASSERT(!outputsDataMap.empty());
     bmOutput[outputsDataMap.begin()->first] = std::shared_ptr<Blob>(&output, [](Blob*){});
     Infer(bmInput, bmOutput);
 }

diff --git a/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp b/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp
@@ -62,6 +62,7 @@ static void insertDiagonalLayerBetween(InferenceEngine::CNNLayerPtr prevLayer,
     gnalog() << "Inserted Diagonal Layer " << diagName <<" between: " << prevLayer->name << " and " << nextLayer->name << "\n" << std::flush;
 
     auto diagLayer = std::make_shared<ScaleShiftLayer>(LayerParams({diagName, "ScaleShift", Precision::FP32}));
+    IE_ASSERT(diagLayer != nullptr);
 
     // TODO: diagonal size
     auto dimsIndex = nextLayer->outData[0]->getTensorDesc().getDims().size() - 1;
@@ -330,11 +331,15 @@ void SubstitutePReluPass::run() {
 
         auto inData_0 = sum->insData[0].lock();
         IE_ASSERT(inData_0 != nullptr);
+        auto creatorLayer_0 = inData_0->getCreatorLayer().lock();
+        IE_ASSERT(creatorLayer_0 != nullptr);
         auto inData_1 = sum->insData[1].lock();
         IE_ASSERT(inData_1 != nullptr);
+        auto creatorLayer_1 = inData_1->getCreatorLayer().lock();
+        IE_ASSERT(creatorLayer_1 != nullptr);
 
-        auto s1 = inData_0->getCreatorLayer().lock().get();
-        auto s2 = inData_1->getCreatorLayer().lock().get();
+        auto s1 = creatorLayer_0.get();
+        auto s2 = creatorLayer_1.get();
 
         if (s1 != static_cast<InferenceEngine::CNNLayer *>(first) &&
             s2 != static_cast<InferenceEngine::CNNLayer *>(first)) {