From dd2ba7ebf78a75aadd8ddd2ae1a4226ffc4ae4d9 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Fri, 1 Mar 2019 11:51:52 +0000 Subject: IVGCVSW-2689 Serialize / de-serialize the Floor layer Change-Id: I61177a999092195fbdfdcf810d289969252dd365 Signed-off-by: Finn Williams --- CMakeLists.txt | 1 + src/armnnDeserializer/Deserializer.cpp | 27 ++++++ src/armnnDeserializer/Deserializer.hpp | 1 + src/armnnDeserializer/DeserializerSupport.md | 1 + src/armnnDeserializer/test/DeserializeFloor.cpp | 110 ++++++++++++++++++++++++ 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 | 42 +++++++++ 10 files changed, 202 insertions(+), 2 deletions(-) create mode 100644 src/armnnDeserializer/test/DeserializeFloor.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index fb3f70b96e..dd30cdb19d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -602,6 +602,7 @@ if(BUILD_UNIT_TESTS) src/armnnDeserializer/test/DeserializeConvolution2d.cpp src/armnnDeserializer/test/DeserializeDivision.cpp src/armnnDeserializer/test/DeserializeEqual.cpp + src/armnnDeserializer/test/DeserializeFloor.cpp src/armnnDeserializer/test/DeserializeFullyConnected.cpp src/armnnDeserializer/test/DeserializeMultiplication.cpp src/armnnDeserializer/test/DeserializeNormalization.cpp diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 0079b6bb37..77bd7498ee 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -194,6 +194,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_DivisionLayer] = &Deserializer::ParseDivision; m_ParserFunctions[Layer_EqualLayer] = &Deserializer::ParseEqual; m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; + m_ParserFunctions[Layer_FloorLayer] = &Deserializer::ParseFloor; m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; m_ParserFunctions[Layer_MaximumLayer] = &Deserializer::ParseMaximum; m_ParserFunctions[Layer_MultiplicationLayer] = &Deserializer::ParseMultiplication; @@ -231,6 +232,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt 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_FloorLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_FloorLayer()->base(); case Layer::Layer_InputLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_InputLayer()->base()->base(); case Layer::Layer_MinimumLayer: @@ -1053,6 +1056,30 @@ void Deserializer::ParseMultiplication(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseFloor(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + CHECK_LOCATION(); + + auto inputs = GetInputs(graph, layerIndex); + CHECK_VALID_SIZE(inputs.size(), 1); + + auto outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto layerName = GetLayerName(graph, layerIndex); + + armnn::IConnectableLayer* layer; + + layer = m_Network->AddFloorLayer(); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + void Deserializer::ParseFullyConnected(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index 4b209cd91a..aa5035ed31 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -79,6 +79,7 @@ private: void ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseDivision(GraphPtr graph, unsigned int layerIndex); void ParseEqual(GraphPtr graph, unsigned int layerIndex); + void ParseFloor(GraphPtr graph, unsigned int layerIndex); void ParseFullyConnected(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 9d07be0e99..765432b8e4 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -14,6 +14,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * DepthwiseConvolution2d * Division * Equal +* Floor * FullyConnected * Maximum * Minimum diff --git a/src/armnnDeserializer/test/DeserializeFloor.cpp b/src/armnnDeserializer/test/DeserializeFloor.cpp new file mode 100644 index 0000000000..211fa1b54b --- /dev/null +++ b/src/armnnDeserializer/test/DeserializeFloor.cpp @@ -0,0 +1,110 @@ +// +// 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 FloorFixture : public ParserFlatbuffersSerializeFixture +{ + explicit FloorFixture(const std::string& shape, + 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: )" + shape + R"(, + dataType: )" + dataType + R"( + }}] + } + }}}, + { + layer_type: "FloorLayer", + layer: { + base: { + index: 1, + layerName: "FloorLayer", + layerType: "Floor", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:0, outputSlotIndex:0 }, + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + shape + R"(, + dataType: )" + dataType + R"( + + }}]}, + + }}, + { + layer_type: "OutputLayer", + layer: { + base:{ + layerBindingId: 2, + base: { + index: 2, + layerName: "OutputLayer", + layerType: "Output", + inputSlots: [{ + index: 0, + connection: {sourceLayerIndex:1, outputSlotIndex:0 }, + }], + outputSlots: [ { + index: 0, + tensorInfo: { + dimensions: )" + shape + R"(, + dataType: )" + dataType + R"( + }, + }], + }}}, + }] + } + )"; + Setup(); + } +}; + + +struct SimpleFloorFixture : FloorFixture +{ + SimpleFloorFixture() : FloorFixture("[ 1, 3, 3, 1 ]", + "Float32") {} +}; + +BOOST_FIXTURE_TEST_CASE(Floor, SimpleFloorFixture) +{ + RunTest<4, armnn::DataType::Float32>( + 4, + {{"InputLayer", { -37.5f, -15.2f, -8.76f, -2.0f, -1.5f, -1.3f, -0.5f, -0.4f, 0.0f}}}, + {{"OutputLayer",{ -38.0f, -16.0f, -9.0f, -2.0f, -2.0f, -2.0f, -1.0f, -1.0f, 0.0f}}}); +} + + +BOOST_AUTO_TEST_SUITE_END() diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 9b23d8508c..4e3180f0ff 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -102,7 +102,8 @@ enum LayerType : uint { Maximum = 18, Normalization = 19, Pad = 20, - Rsqrt = 21 + Rsqrt = 21, + Floor = 22 } // Base layer table to be used as part of other layers @@ -166,6 +167,10 @@ table EqualLayer { base:LayerBase; } +table FloorLayer{ + base:LayerBase; +} + table FullyConnectedLayer { base:LayerBase; descriptor:FullyConnectedDescriptor; @@ -361,7 +366,8 @@ union Layer { MaximumLayer, NormalizationLayer, PadLayer, - RsqrtLayer + RsqrtLayer, + FloorLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 5f9ca13198..d40cdfa591 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -276,6 +276,14 @@ void SerializerVisitor::VisitEqualLayer(const armnn::IConnectableLayer* layer, c CreateAnyLayer(fbEqualLayer.o, serializer::Layer::Layer_EqualLayer); } +void SerializerVisitor::VisitFloorLayer(const armnn::IConnectableLayer *layer, const char *name) +{ + auto flatBufferFloorBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Floor); + auto flatBufferFloorLayer = serializer::CreateFloorLayer(m_flatBufferBuilder, flatBufferFloorBaseLayer); + + CreateAnyLayer(flatBufferFloorLayer.o, serializer::Layer::Layer_FloorLayer); +} + void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name) { auto fbMinimumBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Minimum); diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 6e92a067b6..bf599b1a1f 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -75,6 +75,9 @@ public: void VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; + void VisitFloorLayer(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 b9bc0d4479..b5a322f525 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -14,6 +14,7 @@ The Arm NN SDK Serializer currently supports the following layers: * DepthwiseConvolution2d * Division * Equal +* Floor * FullyConnected * Maximum * Minimum diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 515689a777..5f1745bda5 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -255,6 +255,48 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeConstant) {commonTensorInfo.GetShape()}); } +BOOST_AUTO_TEST_CASE(SerializeFloor) +{ + class VerifyFloorName : public armnn::LayerVisitorBase + { + public: + void VisitMultiplicationLayer(const armnn::IConnectableLayer*, const char* name) override + { + BOOST_TEST(name == "floor"); + } + }; + + const armnn::TensorInfo info({4,4}, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(1); + + const char* floorLayerName = "floor"; + + armnn::IConnectableLayer* const floorLayer = network->AddFloorLayer(floorLayerName); + inputLayer->GetOutputSlot(0).Connect(floorLayer->GetInputSlot(0)); + + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + floorLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer->GetOutputSlot(0).SetTensorInfo(info); + floorLayer->GetOutputSlot(0).SetTensorInfo(info); + + armnnSerializer::Serializer serializer; + serializer.Serialize(*network); + + std::stringstream stream; + serializer.SaveSerializedToStream(stream); + BOOST_TEST(stream.str().length() > 0); + BOOST_TEST(stream.str().find(floorLayerName) != stream.str().npos); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(stream.str()); + BOOST_CHECK(deserializedNetwork); + + VerifyFloorName nameChecker; + deserializedNetwork->Accept(nameChecker); +} + BOOST_AUTO_TEST_CASE(SerializeMinimum) { class VerifyMinimumName : public armnn::LayerVisitorBase -- cgit v1.2.1