commit 5888589ec877d61d21848816c6eacdde5dc068d6
author Éanna Ó Catháin <eanna.ocathain@arm.com> Wed Feb 27 16:16:39 2019 +0000
committer Eanna O Cathain Arm <eanna.ocathain@arm.com> Thu Feb 28 12:21:44 2019 +0000
tree 36f1f7aecfc32d36e9564ef324a96ab48a473b2d
parent 315258e6a2692eef2727326508577e5c73194e85

IVGCVSW-2687 Add Serializer & Deserializer for Division

Change-Id: I230220eccbfb22e56e8d351cc963988d734836ac
Signed-off-by: Éanna Ó Catháin <eanna.ocathain@arm.com>

src/armnnSerializer/ArmnnSchema.fbs

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 7d64dca..95b4cdc 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -95,7 +95,8 @@
     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 @@
     dataLayout:DataLayout = NCHW;
 }
 
+table DivisionLayer {
+    base:LayerBase;
+}
+
 table FullyConnectedLayer {
     base:LayerBase;
     descriptor:FullyConnectedDescriptor;
@@ -293,7 +298,8 @@
     Pooling2dLayer,
     ReshapeLayer,
     SoftmaxLayer,
-    SpaceToBatchNdLayer
+    SpaceToBatchNdLayer,
+    DivisionLayer
 }
 
 table AnyLayer {

src/armnnSerializer/Serializer.cpp

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index dc25bab..5165d17 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -260,6 +260,20 @@
     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)
 {

src/armnnSerializer/Serializer.hpp

diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index f8e2b16..6715951 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -69,6 +69,9 @@
                                           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,

src/armnnSerializer/SerializerSupport.md

diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md
index 6340dd2..c6d7b85 100644
--- a/src/armnnSerializer/SerializerSupport.md
+++ b/src/armnnSerializer/SerializerSupport.md
@@ -12,6 +12,7 @@
 * Constant
 * Convolution2d
 * DepthwiseConvolution2d
+* Division
 * FullyConnected
 * Multiplication
 * Permute

src/armnnSerializer/test/SerializerTests.cpp

diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 8ce9049..13fb0b2 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -728,4 +728,49 @@
                                             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()