diff options
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 10 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 14 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.hpp | 3 | ||||
-rw-r--r-- | src/armnnSerializer/SerializerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 45 |
5 files changed, 71 insertions, 2 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 7d64dca6f3..95b4cdc1c4 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -95,7 +95,8 @@ enum LayerType : uint { FullyConnected = 11, Constant = 12, SpaceToBatchNd = 13, - BatchToSpaceNd = 14 + BatchToSpaceNd = 14, + Division = 15 } // Base layer table to be used as part of other layers @@ -151,6 +152,10 @@ table Convolution2dDescriptor { dataLayout:DataLayout = NCHW; } +table DivisionLayer { + base:LayerBase; +} + table FullyConnectedLayer { base:LayerBase; descriptor:FullyConnectedDescriptor; @@ -293,7 +298,8 @@ union Layer { Pooling2dLayer, ReshapeLayer, SoftmaxLayer, - SpaceToBatchNdLayer + SpaceToBatchNdLayer, + DivisionLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index dc25bab0c6..5165d178ec 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -260,6 +260,20 @@ void SerializerVisitor::VisitDepthwiseConvolution2dLayer(const armnn::IConnectab CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_DepthwiseConvolution2dLayer); } +// Build FlatBuffer for Division Layer +void SerializerVisitor::VisitDivisionLayer(const armnn::IConnectableLayer* layer, const char* name) +{ + // Create FlatBuffer BaseLayer + auto flatBufferDivisionBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Division); + + // Create the FlatBuffer DivisionLayer + auto flatBufferDivisionLayer = + serializer::CreateDivisionLayer(m_flatBufferBuilder, flatBufferDivisionBaseLayer); + + // Add the AnyLayer to the FlatBufferLayers + CreateAnyLayer(flatBufferDivisionLayer.o, serializer::Layer::Layer_DivisionLayer); +} + // 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 f8e2b16bf9..6715951d55 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -69,6 +69,9 @@ public: const armnn::Optional<armnn::ConstTensor>& biases, const char* name = nullptr) override; + void VisitDivisionLayer(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 6340dd2e9a..c6d7b85995 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -12,6 +12,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Constant * Convolution2d * DepthwiseConvolution2d +* Division * FullyConnected * Multiplication * Permute diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 8ce90499df..13fb0b22f8 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -728,4 +728,49 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeBatchToSpaceNd) outputTensorInfo.GetShape()); } +BOOST_AUTO_TEST_CASE(SerializeDivision) +{ + class VerifyDivisionName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy> + { + public: + void VisitDivisionLayer(const armnn::IConnectableLayer*, const char* name) override + { + BOOST_TEST(name == "division"); + } + }; + + const armnn::TensorInfo info({ 1, 5, 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 char* divLayerName = "division"; + + armnn::IConnectableLayer* const divisionLayer = network->AddDivisionLayer(divLayerName); + inputLayer0->GetOutputSlot(0).Connect(divisionLayer->GetInputSlot(0)); + inputLayer1->GetOutputSlot(0).Connect(divisionLayer->GetInputSlot(1)); + + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + divisionLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer0->GetOutputSlot(0).SetTensorInfo(info); + inputLayer1->GetOutputSlot(0).SetTensorInfo(info); + divisionLayer->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(divLayerName) != stream.str().npos); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(stream.str()); + BOOST_CHECK(deserializedNetwork); + + VerifyDivisionName nameChecker; + deserializedNetwork->Accept(nameChecker); +} + BOOST_AUTO_TEST_SUITE_END() |