From 235cea596805ecd074045b33c242cb509b1f647d Mon Sep 17 00:00:00 2001 From: Nattapat Chaimanowong Date: Thu, 28 Feb 2019 16:27:30 +0000 Subject: IVGCVSW-2688 Add Serializer and Deserializer for Equal Change-Id: If613f4394e161483eea4930dab2afba74c5e26fd Signed-off-by: Nattapat Chaimanowong --- CMakeLists.txt | 1 + src/armnnDeserializer/Deserializer.cpp | 23 ++++ src/armnnDeserializer/Deserializer.hpp | 1 + src/armnnDeserializer/DeserializerSupport.md | 1 + src/armnnDeserializer/test/DeserializeEqual.cpp | 148 ++++++++++++++++++++++++ src/armnnSerializer/ArmnnSchema.fbs | 10 +- src/armnnSerializer/Serializer.cpp | 10 ++ src/armnnSerializer/Serializer.hpp | 3 + src/armnnSerializer/SerializerSupport.md | 1 + src/armnnSerializer/test/SerializerTests.cpp | 42 +++++++ 10 files changed, 238 insertions(+), 2 deletions(-) create mode 100644 src/armnnDeserializer/test/DeserializeEqual.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index ecc633734f..a078d73fb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -601,6 +601,7 @@ if(BUILD_UNIT_TESTS) src/armnnDeserializer/test/DeserializeConstant.cpp src/armnnDeserializer/test/DeserializeConvolution2d.cpp src/armnnDeserializer/test/DeserializeDivision.cpp + src/armnnDeserializer/test/DeserializeEqual.cpp src/armnnDeserializer/test/DeserializeFullyConnected.cpp src/armnnDeserializer/test/DeserializeMultiplication.cpp src/armnnDeserializer/test/DeserializePermute.cpp diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 28c6c94c7a..317269ebd0 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -192,6 +192,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_Convolution2dLayer] = &Deserializer::ParseConvolution2d; m_ParserFunctions[Layer_DepthwiseConvolution2dLayer] = &Deserializer::ParseDepthwiseConvolution2d; m_ParserFunctions[Layer_DivisionLayer] = &Deserializer::ParseDivision; + m_ParserFunctions[Layer_EqualLayer] = &Deserializer::ParseEqual; m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; m_ParserFunctions[Layer_MultiplicationLayer] = &Deserializer::ParseMultiplication; @@ -222,6 +223,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_DepthwiseConvolution2dLayer()->base(); case Layer::Layer_DivisionLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_DivisionLayer()->base(); + case Layer::Layer_EqualLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_EqualLayer()->base(); case Layer::Layer_FullyConnectedLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_FullyConnectedLayer()->base(); case Layer::Layer_InputLayer: @@ -958,6 +961,26 @@ void Deserializer::ParseDivision(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseEqual(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + auto inputs = GetInputs(graph, layerIndex); + CHECK_LOCATION(); + CHECK_VALID_SIZE(inputs.size(), 2); + + auto outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto layerName = GetLayerName(graph, layerIndex); + IConnectableLayer* layer = m_Network->AddEqualLayer(layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + void Deserializer::ParseMinimum(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index 657c7f5ed8..e75ab1c5b6 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -75,6 +75,7 @@ private: void ParseConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseDivision(GraphPtr graph, unsigned int layerIndex); + void ParseEqual(GraphPtr graph, unsigned int layerIndex); void ParseFullyConnected(GraphPtr graph, unsigned int layerIndex); void ParseMinimum(GraphPtr graph, unsigned int layerIndex); void ParseMultiplication(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index 8fd7b421a3..791068340f 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -13,6 +13,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Convolution2d * DepthwiseConvolution2d * Division +* Equal * FullyConnected * Minimum * Multiplication diff --git a/src/armnnDeserializer/test/DeserializeEqual.cpp b/src/armnnDeserializer/test/DeserializeEqual.cpp new file mode 100644 index 0000000000..7d8213cd95 --- /dev/null +++ b/src/armnnDeserializer/test/DeserializeEqual.cpp @@ -0,0 +1,148 @@ +// +// 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 EqualFixture : public ParserFlatbuffersSerializeFixture +{ + explicit EqualFixture(const std::string & inputShape1, + const std::string & inputShape2, + const std::string & outputShape, + const std::string & dataType) + { + m_JsonString = R"( + { + inputIds: [0, 1], + 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: )" + inputShape1 + R"(, + dataType: )" + dataType + R"( + }, + }], + }, + } + }, + }, + { + layer_type: "InputLayer", + layer: { + base: { + layerBindingId: 1, + base: { + index:1, + layerName: "InputLayer2", + layerType: "Input", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }], + outputSlots: [{ + index: 0, + tensorInfo: { + dimensions: )" + inputShape2 + R"(, + dataType: )" + dataType + R"( + }, + }], + }, + } + }, + }, + { + layer_type: "EqualLayer", + layer: { + base: { + index:2, + layerName: "EqualLayer", + layerType: "Equal", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }, + { + index: 1, + connection: {sourceLayerIndex:1, outputSlotIndex:0 }, + }], + outputSlots: [{ + index: 0, + tensorInfo: { + dimensions: )" + outputShape + R"(, + dataType: Boolean + }, + }], + } + }, + }, + { + 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: Boolean + }, + }], + } + } + }, + } + ] + } + )"; + Setup(); + } +}; + +struct SimpleEqualFixture : EqualFixture +{ + SimpleEqualFixture() : EqualFixture("[ 2, 2, 2, 1 ]", + "[ 2, 2, 2, 1 ]", + "[ 2, 2, 2, 1 ]", + "QuantisedAsymm8") {} +}; + +BOOST_FIXTURE_TEST_CASE(EqualQuantisedAsymm8, SimpleEqualFixture) +{ + RunTest<4, armnn::DataType::QuantisedAsymm8, armnn::DataType::Boolean>( + 0, + {{"InputLayer1", { 0, 1, 2, 3, 4, 5, 6, 7 }}, + {"InputLayer2", { 0, 0, 0, 3, 0, 0, 6, 7 }}}, + {{"OutputLayer", { 1, 0, 0, 1, 0, 0, 1, 1 }}}); +} + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 501953c60b..5787f512a2 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -97,7 +97,8 @@ enum LayerType : uint { SpaceToBatchNd = 13, BatchToSpaceNd = 14, Division = 15, - Minimum = 16 + Minimum = 16, + Equal = 17 } // Base layer table to be used as part of other layers @@ -157,6 +158,10 @@ table DivisionLayer { base:LayerBase; } +table EqualLayer { + base:LayerBase; +} + table FullyConnectedLayer { base:LayerBase; descriptor:FullyConnectedDescriptor; @@ -305,7 +310,8 @@ union Layer { SoftmaxLayer, SpaceToBatchNdLayer, DivisionLayer, - MinimumLayer + MinimumLayer, + EqualLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 8b8a88dfbc..05b3691616 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -276,6 +276,16 @@ void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, CreateAnyLayer(fbMinimumLayer.o, serializer::Layer::Layer_MinimumLayer); } +// Build FlatBuffer for Equal Layer +void SerializerVisitor::VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name) +{ + auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Equal); + + auto flatBufferEqualLayer = serializer::CreateEqualLayer(m_flatBufferBuilder, flatBufferBaseLayer); + + CreateAnyLayer(flatBufferEqualLayer.o, serializer::Layer::Layer_EqualLayer); +} + // Build FlatBuffer for Multiplication Layer void SerializerVisitor::VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, const char* name) { diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index ecc966cd6c..91180411f5 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -72,6 +72,9 @@ public: void VisitDivisionLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; + void VisitEqualLayer(const armnn::IConnectableLayer* layer, + const char* name = nullptr) override; + void VisitFullyConnectedLayer(const armnn::IConnectableLayer* layer, const armnn::FullyConnectedDescriptor& fullyConnectedDescriptor, const armnn::ConstTensor& weights, diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 31f631030c..426b71ef2b 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -13,6 +13,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Convolution2d * DepthwiseConvolution2d * Division +* Equal * FullyConnected * Minimum * Multiplication diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 4b0077cd65..1d65b1bbfb 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -840,4 +840,46 @@ BOOST_AUTO_TEST_CASE(SerializeDivision) deserializedNetwork->Accept(nameChecker); } +BOOST_AUTO_TEST_CASE(SerializeDeserializeEqual) +{ + class VerifyEqualName : public armnn::LayerVisitorBase + { + public: + void VisitEqualLayer(const armnn::IConnectableLayer*, + const char* name) override + { + BOOST_TEST(name == "EqualLayer"); + } + }; + + const armnn::TensorInfo inputTensorInfo1 = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Float32); + const armnn::TensorInfo inputTensorInfo2 = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Float32); + const armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Boolean); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(0); + armnn::IConnectableLayer* const inputLayer2 = network->AddInputLayer(1); + armnn::IConnectableLayer* const equalLayer = network->AddEqualLayer("EqualLayer"); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer1->GetOutputSlot(0).Connect(equalLayer->GetInputSlot(0)); + inputLayer1->GetOutputSlot(0).SetTensorInfo(inputTensorInfo1); + inputLayer2->GetOutputSlot(0).Connect(equalLayer->GetInputSlot(1)); + inputLayer2->GetOutputSlot(0).SetTensorInfo(inputTensorInfo2); + equalLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + equalLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + VerifyEqualName nameChecker; + deserializedNetwork->Accept(nameChecker); + + CheckDeserializedNetworkAgainstOriginal(*network, + *deserializedNetwork, + {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()}, + {outputTensorInfo.GetShape()}, + {0, 1}); +} + BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.1