From 377351e5420304668da92da4ee00a012923619d1 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Wed, 27 Feb 2019 14:42:31 +0000 Subject: IVGCVSW-2695 Serialize / deserialize the Maximum layer Signed-off-by: Aron Virginas-Tar Change-Id: I6c89a40b1fc00699a048efb26966142517c3ff43 --- src/armnnDeserializer/Deserializer.cpp | 23 +++++++++++++ src/armnnDeserializer/Deserializer.hpp | 1 + src/armnnDeserializer/DeserializerSupport.md | 3 +- src/armnnSerializer/ArmnnSchema.fbs | 10 ++++-- src/armnnSerializer/Serializer.cpp | 18 ++++++---- src/armnnSerializer/Serializer.hpp | 3 ++ src/armnnSerializer/SerializerSupport.md | 3 +- src/armnnSerializer/test/SerializerTests.cpp | 51 ++++++++++++++++++++++++++++ 8 files changed, 102 insertions(+), 10 deletions(-) diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 317269ebd0..076b23e5a4 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -195,6 +195,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_EqualLayer] = &Deserializer::ParseEqual; m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; + m_ParserFunctions[Layer_MaximumLayer] = &Deserializer::ParseMaximum; m_ParserFunctions[Layer_MultiplicationLayer] = &Deserializer::ParseMultiplication; m_ParserFunctions[Layer_PermuteLayer] = &Deserializer::ParsePermute; m_ParserFunctions[Layer_Pooling2dLayer] = &Deserializer::ParsePooling2d; @@ -231,6 +232,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_InputLayer()->base()->base(); case Layer::Layer_MinimumLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_MinimumLayer()->base(); + case Layer::Layer_MaximumLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_MaximumLayer()->base(); case Layer::Layer_MultiplicationLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_MultiplicationLayer()->base(); case Layer::Layer_OutputLayer: @@ -1001,6 +1004,26 @@ void Deserializer::ParseMinimum(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseMaximum(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->AddMaximumLayer(layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + void Deserializer::ParseMultiplication(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index e75ab1c5b6..1dd7ec5284 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -78,6 +78,7 @@ private: void ParseEqual(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); void ParseMultiplication(GraphPtr graph, unsigned int layerIndex); void ParsePermute(GraphPtr graph, unsigned int layerIndex); void ParsePooling2d(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index 791068340f..bb2f0637ac 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -15,6 +15,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Division * Equal * FullyConnected +* Maximum * Minimum * Multiplication * Permute @@ -23,4 +24,4 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Softmax * SpaceToBatchNd -More machine learning layers will be supported in future releases. +More machine learning layers will be supported in future releases. \ No newline at end of file diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 5787f512a2..b59adcf82b 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -98,7 +98,8 @@ enum LayerType : uint { BatchToSpaceNd = 14, Division = 15, Minimum = 16, - Equal = 17 + Equal = 17, + Maximum = 18 } // Base layer table to be used as part of other layers @@ -182,6 +183,10 @@ table MinimumLayer { base:LayerBase; } +table MaximumLayer { + base:LayerBase; +} + table MultiplicationLayer { base:LayerBase; } @@ -311,7 +316,8 @@ union Layer { SpaceToBatchNdLayer, DivisionLayer, MinimumLayer, - EqualLayer + EqualLayer, + MaximumLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 05b3691616..a94a319a4c 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -268,6 +268,14 @@ void SerializerVisitor::VisitDivisionLayer(const armnn::IConnectableLayer* layer CreateAnyLayer(fbDivisionLayer.o, serializer::Layer::Layer_DivisionLayer); } +void SerializerVisitor::VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name) +{ + auto fbBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Equal); + auto fbEqualLayer = serializer::CreateEqualLayer(m_flatBufferBuilder, fbBaseLayer); + + CreateAnyLayer(fbEqualLayer.o, serializer::Layer::Layer_EqualLayer); +} + void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name) { auto fbMinimumBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Minimum); @@ -276,14 +284,12 @@ 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) +void SerializerVisitor::VisitMaximumLayer(const armnn::IConnectableLayer* layer, const char* name) { - auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Equal); - - auto flatBufferEqualLayer = serializer::CreateEqualLayer(m_flatBufferBuilder, flatBufferBaseLayer); + auto fbMaximumBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Maximum); + auto fbMaximumLayer = serializer::CreateMaximumLayer(m_flatBufferBuilder, fbMaximumBaseLayer); - CreateAnyLayer(flatBufferEqualLayer.o, serializer::Layer::Layer_EqualLayer); + CreateAnyLayer(fbMaximumLayer.o, serializer::Layer::Layer_MaximumLayer); } // Build FlatBuffer for Multiplication Layer diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 91180411f5..3d6f1b5700 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -88,6 +88,9 @@ public: void VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; + void VisitMaximumLayer(const armnn::IConnectableLayer* layer, + const char* name = nullptr) override; + void VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 426b71ef2b..83987f98d7 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -15,6 +15,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Division * Equal * FullyConnected +* Maximum * Minimum * Multiplication * Permute @@ -23,4 +24,4 @@ The Arm NN SDK Serializer currently supports the following layers: * Softmax * SpaceToBatchNd -More machine learning layers will be supported in future releases. +More machine learning layers will be supported in future releases. \ No newline at end of file diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 1d65b1bbfb..7e4ff8c614 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -306,6 +306,57 @@ BOOST_AUTO_TEST_CASE(SerializeMinimum) deserializedNetwork->Accept(nameChecker); } +BOOST_AUTO_TEST_CASE(SerializeMaximum) +{ + class VerifyMaximumName : public armnn::LayerVisitorBase + { + public: + explicit VerifyMaximumName(const std::string& expectedMaximumLayerName) + : m_ExpectedMaximumLayerName(expectedMaximumLayerName) {} + + void VisitMaximumLayer(const armnn::IConnectableLayer*, const char* name) override + { + BOOST_TEST(name == m_ExpectedMaximumLayerName.c_str()); + } + + private: + std::string m_ExpectedMaximumLayerName; + }; + + const armnn::TensorInfo info({ 1, 2, 2, 3 }, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); + armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + + const std::string maximumLayerName("maximum"); + + armnn::IConnectableLayer* const maximumLayer = network->AddMaximumLayer(maximumLayerName.c_str()); + inputLayer0->GetOutputSlot(0).Connect(maximumLayer->GetInputSlot(0)); + inputLayer1->GetOutputSlot(0).Connect(maximumLayer->GetInputSlot(1)); + + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + maximumLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer0->GetOutputSlot(0).SetTensorInfo(info); + inputLayer1->GetOutputSlot(0).SetTensorInfo(info); + maximumLayer->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(maximumLayerName) != stream.str().npos); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(stream.str()); + BOOST_CHECK(deserializedNetwork); + + VerifyMaximumName nameChecker(maximumLayerName); + deserializedNetwork->Accept(nameChecker); +} + BOOST_AUTO_TEST_CASE(SerializeMultiplication) { class VerifyMultiplicationName : public armnn::LayerVisitorBase -- cgit v1.2.1