From a1ed73a7c0780584a957509ddc4e65ad4de22c39 Mon Sep 17 00:00:00 2001 From: Saoirse Stewart Date: Mon, 4 Mar 2019 13:40:12 +0000 Subject: IVGCVSW-2691 Add Serialize/Deseralize Gather layer Change-Id: I589d37c9f65801b701858d6e68e2e3151fac6e16 Signed-off-by: Saoirse Stewart --- src/armnnDeserializer/Deserializer.cpp | 30 ++++- src/armnnDeserializer/Deserializer.hpp | 1 + src/armnnDeserializer/DeserializerSupport.md | 1 + src/armnnDeserializer/test/DeserializeGather.cpp | 157 +++++++++++++++++++++++ 4 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 src/armnnDeserializer/test/DeserializeGather.cpp (limited to 'src/armnnDeserializer') diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index e4c9bd67be..405d95ed18 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -196,6 +196,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_EqualLayer] = &Deserializer::ParseEqual; m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; m_ParserFunctions[Layer_FloorLayer] = &Deserializer::ParseFloor; + m_ParserFunctions[Layer_GatherLayer] = &Deserializer::ParseGather; m_ParserFunctions[Layer_GreaterLayer] = &Deserializer::ParseGreater; m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; m_ParserFunctions[Layer_MaximumLayer] = &Deserializer::ParseMaximum; @@ -241,6 +242,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_FullyConnectedLayer()->base(); case Layer::Layer_FloorLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_FloorLayer()->base(); + case Layer::Layer_GatherLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_GatherLayer()->base(); case Layer::Layer_GreaterLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_GreaterLayer()->base(); case Layer::Layer_InputLayer: @@ -468,7 +471,7 @@ Deserializer::LayerBaseRawPtrVector Deserializer::GetGraphOutputs(const GraphPtr } Deserializer::TensorRawPtrVector Deserializer::GetInputs(const GraphPtr& graphPtr, - unsigned int layerIndex) + unsigned int layerIndex) { CHECK_LAYERS(graphPtr, 0, layerIndex); auto layer = GetBaseLayer(graphPtr, layerIndex); @@ -611,7 +614,7 @@ INetworkPtr Deserializer::CreateNetworkFromGraph(GraphPtr graph) } BindingPointInfo Deserializer::GetNetworkInputBindingInfo(unsigned int layerIndex, - const std::string& name) const + const std::string& name) const { for (auto inputBinding : m_InputBindings) { @@ -1710,4 +1713,27 @@ void Deserializer::ParseSubtraction(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseGather(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + + Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + CHECK_VALID_SIZE(inputs.size(), 2); + + Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto layerName = GetLayerName(graph, layerIndex); + + IConnectableLayer* layer = m_Network->AddGatherLayer(layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); + +} + } // namespace armnnDeserializer diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index b45551feb0..058002548a 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -82,6 +82,7 @@ private: void ParseEqual(GraphPtr graph, unsigned int layerIndex); void ParseFloor(GraphPtr graph, unsigned int layerIndex); void ParseFullyConnected(GraphPtr graph, unsigned int layerIndex); + void ParseGather(GraphPtr graph, unsigned int layerIndex); void ParseGreater(GraphPtr graph, unsigned int layerIndex); void ParseMinimum(GraphPtr graph, unsigned int layerIndex); void ParseMaximum(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index a295676a84..cc7c62662a 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -17,6 +17,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Equal * Floor * FullyConnected +* Gather * Greater * Maximum * Minimum diff --git a/src/armnnDeserializer/test/DeserializeGather.cpp b/src/armnnDeserializer/test/DeserializeGather.cpp new file mode 100644 index 0000000000..3fdcf51aed --- /dev/null +++ b/src/armnnDeserializer/test/DeserializeGather.cpp @@ -0,0 +1,157 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include +#include "ParserFlatbuffersSerializeFixture.hpp" +#include "../Deserializer.hpp" + +#include +#include + +BOOST_AUTO_TEST_SUITE(Deserializer) + +struct GatherFixture : public ParserFlatbuffersSerializeFixture +{ + explicit GatherFixture(const std::string &inputShape, + const std::string &indicesShape, + const std::string &input1Content, + const std::string &outputShape, + const std::string dataType, + const std::string constDataType) + { + m_JsonString = R"( + { + inputIds: [0], + outputIds: [3], + layers: [ + { + layer_type: "InputLayer", + layer: { + base: { + layerBindingId: 0, + base: { + index: 0, + layerName: "InputLayer", + layerType: "Input", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + inputShape + R"(, + dataType: )" + dataType + R"( + }}] + } + }}}, + { + layer_type: "ConstantLayer", + layer: { + base: { + index:1, + layerName: "ConstantLayer", + layerType: "Constant", + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + indicesShape + R"(, + dataType: "Signed32", + }, + }], + }, + input: { + info: { + dimensions: )" + indicesShape + R"(, + dataType: )" + dataType + R"( + }, + data_type: )" + constDataType + R"(, + data: { + data: )" + input1Content + R"(, + } } + },}, + { + layer_type: "GatherLayer", + layer: { + base: { + index: 2, + layerName: "GatherLayer", + layerType: "Gather", + inputSlots: [ + { + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }, + { + index: 1, + connection: {sourceLayerIndex:1, outputSlotIndex:0 } + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + outputShape + R"(, + dataType: )" + dataType + R"( + + }}]} + }}, + { + layer_type: "OutputLayer", + layer: { + base:{ + layerBindingId: 0, + base: { + index: 3, + layerName: "OutputLayer", + layerType: "Output", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:2, outputSlotIndex:0 }, + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + outputShape + R"(, + dataType: )" + dataType + R"( + }, + }], + }}}, + }] + } )"; + + Setup(); + } +}; + +struct SimpleGatherFixtureFloat32 : GatherFixture +{ + SimpleGatherFixtureFloat32() : GatherFixture("[ 3, 2, 3 ]", "[ 2, 3 ]", "[1, 2, 1, 2, 1, 0]", + "[ 2, 3, 2, 3 ]", "Float32", "IntData") {} +}; + +BOOST_FIXTURE_TEST_CASE(GatherFloat32, SimpleGatherFixtureFloat32) +{ + RunTest<4, armnn::DataType::Float32>(0, + {{"InputLayer", { 1, 2, 3, + 4, 5, 6, + 7, 8, 9, + 10, 11, 12, + 13, 14, 15, + 16, 17, 18 }}}, + {{"OutputLayer", { 7, 8, 9, + 10, 11, 12, + 13, 14, 15, + 16, 17, 18, + 7, 8, 9, + 10, 11, 12, + 13, 14, 15, + 16, 17, 18, + 7, 8, 9, + 10, 11, 12, + 1, 2, 3, + 4, 5, 6 }}}); +} + +BOOST_AUTO_TEST_SUITE_END() + -- cgit v1.2.1