diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2019-03-04 17:44:21 +0000 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-03-07 09:24:37 +0000 |
commit | ac97c8cda28f81ce76834b8b769967d42b02e2ac (patch) | |
tree | 7bf1b1104a4bfb041ee5d74cabe1e1be2664af70 /src/armnnSerializer | |
parent | c192f35edefd0977396db8d381adc7598e3660cc (diff) | |
download | armnn-ac97c8cda28f81ce76834b8b769967d42b02e2ac.tar.gz |
IVGCVSW-2696 Serialize / de-serialize the Mean layer
Change-Id: Iee4bab5a6d6b992cf4bba8697a2918f854c906a3
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 16 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 53 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.hpp | 4 | ||||
-rw-r--r-- | src/armnnSerializer/SerializerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 40 |
5 files changed, 91 insertions, 23 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index ac32e661c0..01142ff391 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -109,7 +109,8 @@ enum LayerType : uint { ResizeBilinear = 25, Subtraction = 26, StridedSlice = 27, - Gather = 28 + Gather = 28, + Mean = 29 } // Base layer table to be used as part of other layers @@ -349,6 +350,16 @@ table NormalizationDescriptor { dataLayout:DataLayout = NCHW; } +table MeanLayer { + base:LayerBase; + descriptor:MeanDescriptor; +} + +table MeanDescriptor { + axis:[uint]; + keepDims:bool = false; +} + table PadLayer { base:LayerBase; descriptor:PadDescriptor; @@ -433,7 +444,8 @@ union Layer { ResizeBilinearLayer, SubtractionLayer, StridedSliceLayer, - GatherLayer + GatherLayer, + MeanLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 4e408ae807..56c4281a87 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -313,12 +313,20 @@ void SerializerVisitor::VisitFloorLayer(const armnn::IConnectableLayer *layer, c CreateAnyLayer(flatBufferFloorLayer.o, serializer::Layer::Layer_FloorLayer); } -void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name) +void SerializerVisitor::VisitGatherLayer(const armnn::IConnectableLayer* layer, const char* name) { - auto fbMinimumBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Minimum); - auto fbMinimumLayer = serializer::CreateMinimumLayer(m_flatBufferBuilder, fbMinimumBaseLayer); + auto fbGatherBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Gather); + auto flatBufferLayer = serializer::CreateGatherLayer(m_flatBufferBuilder, fbGatherBaseLayer); - CreateAnyLayer(fbMinimumLayer.o, serializer::Layer::Layer_MinimumLayer); + CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_GatherLayer); +} + +void SerializerVisitor::VisitGreaterLayer(const armnn::IConnectableLayer* layer, const char* name) +{ + auto fbGreaterBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Greater); + auto fbGreaterLayer = serializer::CreateGreaterLayer(m_flatBufferBuilder, fbGreaterBaseLayer); + + CreateAnyLayer(fbGreaterLayer.o, serializer::Layer::Layer_GreaterLayer); } void SerializerVisitor::VisitMaximumLayer(const armnn::IConnectableLayer* layer, const char* name) @@ -329,34 +337,37 @@ void SerializerVisitor::VisitMaximumLayer(const armnn::IConnectableLayer* layer, CreateAnyLayer(fbMaximumLayer.o, serializer::Layer::Layer_MaximumLayer); } -void SerializerVisitor::VisitGatherLayer(const armnn::IConnectableLayer* layer, const char* name) +void SerializerVisitor::VisitMeanLayer(const armnn::IConnectableLayer* layer, + const armnn::MeanDescriptor& descriptor, + const char* name) { - auto fbGatherBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Gather); - auto flatBufferLayer = serializer::CreateGatherLayer(m_flatBufferBuilder, fbGatherBaseLayer); + auto fbMeanBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Mean); + auto fbMeanDescriptor = serializer::CreateMeanDescriptor(m_flatBufferBuilder, + m_flatBufferBuilder.CreateVector(descriptor.m_Axis), + descriptor.m_KeepDims); - CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_GatherLayer); + auto fbMeanLayer = serializer::CreateMeanLayer(m_flatBufferBuilder, + fbMeanBaseLayer, + fbMeanDescriptor); + + CreateAnyLayer(fbMeanLayer.o, serializer::Layer::Layer_MeanLayer); } -void SerializerVisitor::VisitGreaterLayer(const armnn::IConnectableLayer* layer, const char* name) +void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name) { - auto fbGreaterBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Greater); - auto fbGreaterLayer = serializer::CreateGreaterLayer(m_flatBufferBuilder, fbGreaterBaseLayer); + auto fbMinimumBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Minimum); + auto fbMinimumLayer = serializer::CreateMinimumLayer(m_flatBufferBuilder, fbMinimumBaseLayer); - CreateAnyLayer(fbGreaterLayer.o, serializer::Layer::Layer_GreaterLayer); + CreateAnyLayer(fbMinimumLayer.o, serializer::Layer::Layer_MinimumLayer); } -// Build FlatBuffer for Multiplication Layer void SerializerVisitor::VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, const char* name) { - // Create FlatBuffer BaseLayer - auto flatBufferMultiplicationBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Multiplication); - - // Create the FlatBuffer MultiplicationLayer - auto flatBufferMultiplicationLayer = - serializer::CreateMultiplicationLayer(m_flatBufferBuilder, flatBufferMultiplicationBaseLayer); + auto fbMultiplicationBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Multiplication); + auto fbMultiplicationLayer = serializer::CreateMultiplicationLayer(m_flatBufferBuilder, + fbMultiplicationBaseLayer); - // Add the AnyLayer to the FlatBufferLayers - CreateAnyLayer(flatBufferMultiplicationLayer.o, serializer::Layer::Layer_MultiplicationLayer); + CreateAnyLayer(fbMultiplicationLayer.o, serializer::Layer::Layer_MultiplicationLayer); } void SerializerVisitor::VisitPadLayer(const armnn::IConnectableLayer* layer, diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 5244a3c1fd..f928c37d30 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -102,6 +102,10 @@ public: armnn::LayerBindingId id, const char* name = nullptr) override; + void VisitMeanLayer(const armnn::IConnectableLayer* layer, + const armnn::MeanDescriptor& descriptor, + const char* name) override; + void VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 24a764ac95..bb50242e90 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -20,6 +20,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Gather * Greater * Maximum +* Mean * Minimum * Multiplication * Normalization diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 0689114074..a18ae32a03 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1334,4 +1334,44 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeStridedSlice) {outputTensorInfo.GetShape()}); } +BOOST_AUTO_TEST_CASE(SerializeDeserializeMean) +{ + class VerifyMeanName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy> + { + public: + void VisitMeanLayer(const armnn::IConnectableLayer*, const armnn::MeanDescriptor&, const char* name) + { + BOOST_TEST(name == "mean"); + } + }; + + armnn::TensorInfo inputTensorInfo({1, 1, 3, 2}, armnn::DataType::Float32); + armnn::TensorInfo outputTensorInfo({1, 1, 1, 2}, armnn::DataType::Float32); + + armnn::MeanDescriptor descriptor; + descriptor.m_Axis = { 2 }; + descriptor.m_KeepDims = true; + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); + armnn::IConnectableLayer* const meanLayer = network->AddMeanLayer(descriptor, "mean"); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer->GetOutputSlot(0).Connect(meanLayer->GetInputSlot(0)); + inputLayer->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); + meanLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + meanLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + VerifyMeanName nameChecker; + deserializedNetwork->Accept(nameChecker); + + CheckDeserializedNetworkAgainstOriginal<float>(*deserializedNetwork, + *network, + {inputTensorInfo.GetShape()}, + {outputTensorInfo.GetShape()}); +} + BOOST_AUTO_TEST_SUITE_END() |