diff options
author | Conor Kennedy <conor.kennedy@arm.com> | 2019-02-26 08:29:54 +0000 |
---|---|---|
committer | derek.lamberti <derek.lamberti@arm.com> | 2019-02-26 14:29:20 +0000 |
commit | 762778817f6567f405d5d705f9c2131bab799e66 (patch) | |
tree | 06302ac5067404e61f7a66161fa6f30ec02682bc /src/armnnDeserializer | |
parent | b3d481a25ee4e8b24f615627122ccb7a7a1028da (diff) | |
download | armnn-762778817f6567f405d5d705f9c2131bab799e66.tar.gz |
IVGCVSW-2683 Add Serializer & Deserializer for Constant
Change-Id: Iad7d89dfa963d9015cbe044f67aecc8bf6634b10
Signed-off-by: Conor Kennedy <conor.kennedy@arm.com>
Diffstat (limited to 'src/armnnDeserializer')
-rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 26 | ||||
-rw-r--r-- | src/armnnDeserializer/Deserializer.hpp | 1 | ||||
-rw-r--r-- | src/armnnDeserializer/DeserializerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnDeserializer/test/DeserializeConstant.cpp | 152 |
4 files changed, 180 insertions, 0 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 09c0502886..b263c3a769 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -187,6 +187,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) // register supported layers m_ParserFunctions[Layer_ActivationLayer] = &Deserializer::ParseActivation; m_ParserFunctions[Layer_AdditionLayer] = &Deserializer::ParseAdd; + m_ParserFunctions[Layer_ConstantLayer] = &Deserializer::ParseConstant; m_ParserFunctions[Layer_Convolution2dLayer] = &Deserializer::ParseConvolution2d; m_ParserFunctions[Layer_DepthwiseConvolution2dLayer] = &Deserializer::ParseDepthwiseConvolution2d; m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; @@ -207,6 +208,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_ActivationLayer()->base(); case Layer::Layer_AdditionLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_AdditionLayer()->base(); + case Layer::Layer_ConstantLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_ConstantLayer()->base(); case Layer::Layer_Convolution2dLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_Convolution2dLayer()->base(); case Layer::Layer_DepthwiseConvolution2dLayer: @@ -772,6 +775,29 @@ void Deserializer::ParseAdd(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseConstant(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + CHECK_LOCATION(); + + auto outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto layerName = GetLayerName(graph, layerIndex); + + auto serializerLayer = graph->layers()->Get(layerIndex)->layer_as_ConstantLayer(); + auto serializerInput = serializerLayer->input(); + + armnn::ConstTensor input = ToConstTensor(serializerInput); + + IConnectableLayer* layer = m_Network->AddConstantLayer(input, layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterOutputSlots(graph, layerIndex, layer); +} + void Deserializer::ParseConvolution2d(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index 94318e4062..9159ff2f36 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -70,6 +70,7 @@ private: void ParseUnsupportedLayer(GraphPtr graph, unsigned int layerIndex); void ParseActivation(GraphPtr graph, unsigned int layerIndex); void ParseAdd(GraphPtr graph, unsigned int layerIndex); + void ParseConstant(GraphPtr graph, unsigned int layerIndex); void ParseConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseFullyConnected(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index 7e7ee06afe..988144425c 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -8,6 +8,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Activation * Addition +* Constant * Convolution2d * DepthwiseConvolution2d * FullyConnected diff --git a/src/armnnDeserializer/test/DeserializeConstant.cpp b/src/armnnDeserializer/test/DeserializeConstant.cpp new file mode 100644 index 0000000000..0abe5e6ca1 --- /dev/null +++ b/src/armnnDeserializer/test/DeserializeConstant.cpp @@ -0,0 +1,152 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include <boost/test/unit_test.hpp> +#include "ParserFlatbuffersSerializeFixture.hpp" +#include "../Deserializer.hpp" + +#include <string> +#include <iostream> + +BOOST_AUTO_TEST_SUITE(DeserializeParser) + +struct ConstantAddFixture : public ParserFlatbuffersSerializeFixture +{ + explicit ConstantAddFixture(const std::string & shape, + const std::string & constTensorDatatype, + const std::string & constData, + const std::string & dataType) + { + m_JsonString = R"( + { + inputIds: [0], + outputIds: [3], + layers: [ + { + layer_type: "InputLayer", + layer: { + base: { + layerBindingId: 0, + base: { + index: 0, + layerName: "InputLayer1", + layerType: "Input", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + shape + R"(, + dataType: )" + dataType + R"( + }, + }], + },}}, + }, + { + layer_type: "ConstantLayer", + layer: { + base: { + index:1, + layerName: "ConstantLayer", + layerType: "Constant", + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + shape + R"(, + dataType: )" + dataType + R"(, + }, + }], + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }], + }, + input: { + info: { + dimensions: )" + shape + R"(, + dataType: )" + dataType + R"( + }, + data_type: )" + constTensorDatatype + R"(, + data: { + data: )" + constData + R"(, + } } + }, + }, + { + layer_type: "AdditionLayer", + layer : { + base: { + index:2, + layerName: "AdditionLayer", + layerType: "Addition", + inputSlots: [ + { + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }, + { + index: 1, + connection: {sourceLayerIndex:1, outputSlotIndex:0 }, + } + ], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + shape + 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: )" + shape + R"(, + dataType: )" + dataType + R"( + }, + }], + }}}, + }] + } + )"; + SetupSingleInputSingleOutput("InputLayer1", "OutputLayer"); + } +}; + +struct SimpleConstantAddFixture : ConstantAddFixture +{ + SimpleConstantAddFixture() + : ConstantAddFixture("[ 2, 3 ]", // shape + "ByteData", // constDataType + "[ 1, 2, 3, 4, 5, 6 ]", // constData + "QuantisedAsymm8") // datatype + + {} +}; + +BOOST_FIXTURE_TEST_CASE(SimpleConstantAddQuantisedAsymm8, SimpleConstantAddFixture) +{ + RunTest<2, armnn::DataType::QuantisedAsymm8>( + 0, + { 1, 2, 3, 4, 5, 6 }, + { 2, 4, 6, 8, 10, 12 }); +} + +BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file |