commit 3fcef20ff9b6fec5b853bc8166db8b9ae88f9f39
author Saoirse Stewart <saoirse.stewart@arm.com> Thu Feb 14 14:57:37 2019 +0000
committer Saoirse Stewart Arm <saoirse.stewart@arm.com> Fri Feb 15 08:57:12 2019 +0000
tree de5ca9dc47933614e6d95438a5169cbbbad9ca85
parent 5b2159e43a5e078053e706883e3af44ae733b5b9

IVGCVSW-2642 Fix layerBindingId issue

Change-Id: I24fef25ab12df07b98d78de98563ee4a2b9977ba
Signed-off-by: Saoirse Stewart <saoirse.stewart@arm.com>

src/armnnDeserializeParser/DeserializeParser.cpp

diff --git a/src/armnnDeserializeParser/DeserializeParser.cpp b/src/armnnDeserializeParser/DeserializeParser.cpp
index 0368cca..123fc93 100644
--- a/src/armnnDeserializeParser/DeserializeParser.cpp
+++ b/src/armnnDeserializeParser/DeserializeParser.cpp
@@ -465,7 +465,7 @@
     for (auto const& input : inputs)
     {
         IConnectableLayer* layer =
-            m_Network->AddInputLayer(static_cast<int>(input->index()), input->layerName()->c_str());
+            m_Network->AddInputLayer(GetBindingLayerInfo(m_Graph, input->index()), input->layerName()->c_str());
 
         auto tensorInfo = ToTensorInfo(input->outputSlots()->Get(0)->tensorInfo());
         layer->GetOutputSlot(0).SetTensorInfo(tensorInfo);
@@ -481,7 +481,7 @@
     for (auto const& output : outputs)
     {
         IConnectableLayer* layer =
-            m_Network->AddOutputLayer(static_cast<int>(output->index()), output->layerName()->c_str());
+            m_Network->AddOutputLayer(GetBindingLayerInfo(m_Graph, output->index()), output->layerName()->c_str());
 
         RegisterInputSlots(output->index(), layer);
     }

src/armnnDeserializeParser/test/DeserializeAdd.cpp

diff --git a/src/armnnDeserializeParser/test/DeserializeAdd.cpp b/src/armnnDeserializeParser/test/DeserializeAdd.cpp
index 03d50e3..f0b8590 100644
--- a/src/armnnDeserializeParser/test/DeserializeAdd.cpp
+++ b/src/armnnDeserializeParser/test/DeserializeAdd.cpp
@@ -99,7 +99,7 @@
                 layer_type: "OutputLayer",
                 layer: {
                         base:{
-                              layerBindingId: 3,
+                              layerBindingId: 0,
                               base: {
                                     index: 3,
                                     layerName: "OutputLayer",

src/armnnDeserializeParser/test/DeserializeMultiplication.cpp

diff --git a/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp b/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp
index f8eff16..f69413b 100644
--- a/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp
+++ b/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp
@@ -99,7 +99,7 @@
                 layer_type: "OutputLayer",
                 layer: {
                         base:{
-                              layerBindingId: 3,
+                              layerBindingId: 0,
                               base: {
                                     index: 3,
                                     layerName: "OutputLayer",