aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaoirse Stewart <saoirse.stewart@arm.com>2019-02-14 14:57:37 +0000
committerSaoirse Stewart Arm <saoirse.stewart@arm.com>2019-02-15 08:57:12 +0000
commit3fcef20ff9b6fec5b853bc8166db8b9ae88f9f39 (patch)
treede5ca9dc47933614e6d95438a5169cbbbad9ca85
parent5b2159e43a5e078053e706883e3af44ae733b5b9 (diff)
downloadarmnn-3fcef20ff9b6fec5b853bc8166db8b9ae88f9f39.tar.gz
IVGCVSW-2642 Fix layerBindingId issue
Change-Id: I24fef25ab12df07b98d78de98563ee4a2b9977ba Signed-off-by: Saoirse Stewart <saoirse.stewart@arm.com>
-rw-r--r--src/armnnDeserializeParser/DeserializeParser.cpp4
-rw-r--r--src/armnnDeserializeParser/test/DeserializeAdd.cpp2
-rw-r--r--src/armnnDeserializeParser/test/DeserializeMultiplication.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/armnnDeserializeParser/DeserializeParser.cpp b/src/armnnDeserializeParser/DeserializeParser.cpp
index 0368ccabf2..123fc9366c 100644
--- a/src/armnnDeserializeParser/DeserializeParser.cpp
+++ b/src/armnnDeserializeParser/DeserializeParser.cpp
@@ -465,7 +465,7 @@ void DeserializeParser::SetupInputLayers()
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 @@ void DeserializeParser::SetupOutputLayers()
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);
}
diff --git a/src/armnnDeserializeParser/test/DeserializeAdd.cpp b/src/armnnDeserializeParser/test/DeserializeAdd.cpp
index 03d50e3fe0..f0b85905b3 100644
--- a/src/armnnDeserializeParser/test/DeserializeAdd.cpp
+++ b/src/armnnDeserializeParser/test/DeserializeAdd.cpp
@@ -99,7 +99,7 @@ struct AddFixture : public ParserFlatbuffersSerializeFixture
layer_type: "OutputLayer",
layer: {
base:{
- layerBindingId: 3,
+ layerBindingId: 0,
base: {
index: 3,
layerName: "OutputLayer",
diff --git a/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp b/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp
index f8eff1697a..f69413b223 100644
--- a/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp
+++ b/src/armnnDeserializeParser/test/DeserializeMultiplication.cpp
@@ -99,7 +99,7 @@ struct MultiplicationFixture : public ParserFlatbuffersSerializeFixture
layer_type: "OutputLayer",
layer: {
base:{
- layerBindingId: 3,
+ layerBindingId: 0,
base: {
index: 3,
layerName: "OutputLayer",