From 8b42a380b5cd4dae367c8bf9a2566985ed92c516 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Fri, 1 Mar 2019 14:24:49 +0000 Subject: IVGCVSW-2706 Serialize / de-serialize the Rsqrt layer Change-Id: Ic1cfa0833c3531c743ba2d2f277fd70086357119 Signed-off-by: Sadik Armagan --- CMakeLists.txt | 1 + src/armnnDeserializer/Deserializer.cpp | 23 +++++ src/armnnDeserializer/Deserializer.hpp | 1 + src/armnnDeserializer/DeserializerSupport.md | 1 + src/armnnDeserializer/test/DeserializeRsqrt.cpp | 117 ++++++++++++++++++++++++ src/armnnSerializer/ArmnnSchema.fbs | 10 +- src/armnnSerializer/Serializer.cpp | 8 ++ src/armnnSerializer/Serializer.hpp | 3 + src/armnnSerializer/SerializerSupport.md | 1 + src/armnnSerializer/test/SerializerTests.cpp | 36 ++++++++ 10 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 src/armnnDeserializer/test/DeserializeRsqrt.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 037a9aee2c..fb3f70b96e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -609,6 +609,7 @@ if(BUILD_UNIT_TESTS) src/armnnDeserializer/test/DeserializePermute.cpp src/armnnDeserializer/test/DeserializePooling2d.cpp src/armnnDeserializer/test/DeserializeReshape.cpp + src/armnnDeserializer/test/DeserializeRsqrt.cpp src/armnnDeserializer/test/DeserializeSpaceToBatchNd.cpp src/armnnDeserializer/test/ParserFlatbuffersSerializeFixture.hpp src/armnnDeserializer/test/SchemaSerialize.s diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index b8a1eaa84a..0079b6bb37 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -202,6 +202,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_PermuteLayer] = &Deserializer::ParsePermute; m_ParserFunctions[Layer_Pooling2dLayer] = &Deserializer::ParsePooling2d; m_ParserFunctions[Layer_ReshapeLayer] = &Deserializer::ParseReshape; + m_ParserFunctions[Layer_RsqrtLayer] = &Deserializer::ParseRsqrt; m_ParserFunctions[Layer_SoftmaxLayer] = &Deserializer::ParseSoftmax; m_ParserFunctions[Layer_SpaceToBatchNdLayer] = &Deserializer::ParseSpaceToBatchNd; } @@ -250,6 +251,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_Pooling2dLayer()->base(); case Layer::Layer_ReshapeLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_ReshapeLayer()->base(); + case Layer::Layer_RsqrtLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_RsqrtLayer()->base(); case Layer::Layer_SoftmaxLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_SoftmaxLayer()->base(); case Layer::Layer_SpaceToBatchNdLayer: @@ -1496,4 +1499,24 @@ void Deserializer::ParseNormalization(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseRsqrt(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + auto inputs = GetInputs(graph, layerIndex); + CHECK_LOCATION(); + CHECK_VALID_SIZE(inputs.size(), 1); + + auto outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto layerName = GetLayerName(graph, layerIndex); + IConnectableLayer* layer = m_Network->AddRsqrtLayer(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 ec10cb5817..4b209cd91a 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -88,6 +88,7 @@ private: void ParsePermute(GraphPtr graph, unsigned int layerIndex); void ParsePooling2d(GraphPtr graph, unsigned int layerIndex); void ParseReshape(GraphPtr graph, unsigned int layerIndex); + void ParseRsqrt(GraphPtr graph, unsigned int layerIndex); void ParseSoftmax(GraphPtr graph, unsigned int layerIndex); void ParseSpaceToBatchNd(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index 1f479b94b8..9d07be0e99 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -23,6 +23,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Permute * Pooling2d * Reshape +* Rsqrt * Softmax * SpaceToBatchNd diff --git a/src/armnnDeserializer/test/DeserializeRsqrt.cpp b/src/armnnDeserializer/test/DeserializeRsqrt.cpp new file mode 100644 index 0000000000..4361e50485 --- /dev/null +++ b/src/armnnDeserializer/test/DeserializeRsqrt.cpp @@ -0,0 +1,117 @@ +// +// 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 RsqrtFixture : public ParserFlatbuffersSerializeFixture +{ + explicit RsqrtFixture(const std::string & inputShape, + const std::string & outputShape, + const std::string & dataType) + { + m_JsonString = R"( + { + inputIds: [0], + outputIds: [2], + 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: "RsqrtLayer", + layer : { + base: { + index:1, + layerName: "RsqrtLayer", + layerType: "Rsqrt", + inputSlots: [ + { + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + } + ], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + outputShape + R"(, + dataType: )" + dataType + R"( + }, + }], + }}, + }, + { + layer_type: "OutputLayer", + layer: { + base:{ + layerBindingId: 0, + base: { + index: 2, + layerName: "OutputLayer", + layerType: "Output", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:1, outputSlotIndex:0 }, + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + outputShape + R"(, + dataType: )" + dataType + R"( + }, + }], + }}}, + }] + } + )"; + Setup(); + } +}; + + +struct Rsqrt2dFixture : RsqrtFixture +{ + Rsqrt2dFixture() : RsqrtFixture("[ 2, 2 ]", + "[ 2, 2 ]", + "Float32") {} +}; + +BOOST_FIXTURE_TEST_CASE(Rsqrt2d, Rsqrt2dFixture) +{ + RunTest<2, armnn::DataType::Float32>( + 0, + {{"InputLayer", { 1.0f, 4.0f, + 16.0f, 25.0f }}}, + {{"OutputLayer",{ 1.0f, 0.5f, + 0.25f, 0.2f }}}); +} + + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 552c2cc056..9b23d8508c 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -101,7 +101,8 @@ enum LayerType : uint { Equal = 17, Maximum = 18, Normalization = 19, - Pad = 20 + Pad = 20, + Rsqrt = 21 } // Base layer table to be used as part of other layers @@ -334,6 +335,10 @@ table PadDescriptor { padList:[uint]; } +table RsqrtLayer { + base:LayerBase; +} + union Layer { ActivationLayer, AdditionLayer, @@ -355,7 +360,8 @@ union Layer { EqualLayer, MaximumLayer, NormalizationLayer, - PadLayer + PadLayer, + RsqrtLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 868a36d42e..5f9ca13198 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -379,6 +379,14 @@ void SerializerVisitor::VisitReshapeLayer(const armnn::IConnectableLayer* layer, CreateAnyLayer(flatBufferReshapeLayer.o, serializer::Layer::Layer_ReshapeLayer); } +void SerializerVisitor::VisitRsqrtLayer(const armnn::IConnectableLayer* layer, const char* name) +{ + auto fbRsqrtBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Rsqrt); + auto fbRsqrtLayer = serializer::CreateRsqrtLayer(m_flatBufferBuilder, fbRsqrtBaseLayer); + + CreateAnyLayer(fbRsqrtLayer.o, serializer::Layer::Layer_RsqrtLayer); +} + // Build FlatBuffer for Softmax Layer void SerializerVisitor::VisitSoftmaxLayer(const armnn::IConnectableLayer* layer, const armnn::SoftmaxDescriptor& softmaxDescriptor, diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index ef56c25f2c..6e92a067b6 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -114,6 +114,9 @@ public: const armnn::ReshapeDescriptor& reshapeDescriptor, const char* name = nullptr) override; + void VisitRsqrtLayer(const armnn::IConnectableLayer* layer, + const char* name = nullptr) override; + void VisitSoftmaxLayer(const armnn::IConnectableLayer* layer, const armnn::SoftmaxDescriptor& softmaxDescriptor, const char* name = nullptr) override; diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index a77e8860a2..b9bc0d4479 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -23,6 +23,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Permute * Pooling2d * Reshape +* Rsqrt * Softmax * SpaceToBatchNd diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 110bf0c581..515689a777 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1021,4 +1021,40 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializePad) {outputTensorInfo.GetShape()}); } +BOOST_AUTO_TEST_CASE(SerializeRsqrt) +{ + class VerifyRsqrtName : public armnn::LayerVisitorBase + { + public: + void VisitRsqrtLayer(const armnn::IConnectableLayer*, const char* name) override + { + BOOST_TEST(name == "rsqrt"); + } + }; + + const armnn::TensorInfo tensorInfo({ 3, 1, 2 }, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); + armnn::IConnectableLayer* const rsqrtLayer = network->AddRsqrtLayer("rsqrt"); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer->GetOutputSlot(0).Connect(rsqrtLayer->GetInputSlot(0)); + rsqrtLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); + rsqrtLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + VerifyRsqrtName nameChecker; + deserializedNetwork->Accept(nameChecker); + + CheckDeserializedNetworkAgainstOriginal(*network, + *deserializedNetwork, + {tensorInfo.GetShape()}, + {tensorInfo.GetShape()}); +} + BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.1