From 4ffcc8fb1d4c893e62a8c1fb330fe2742cff5407 Mon Sep 17 00:00:00 2001
From: FinnWilliamsArm <Finn.Williams@arm.com>
Date: Thu, 5 Sep 2019 14:34:20 +0100
Subject: IVGCVSW-3739 Add serialization support for Abs

Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: I42c348515f3f93efc2e0570bbebdc77306f12468
---
 src/armnnSerializer/ArmnnSchema.fbs          | 11 ++++++--
 src/armnnSerializer/Serializer.cpp           |  5 +++-
 src/armnnSerializer/SerializerSupport.md     |  1 +
 src/armnnSerializer/test/SerializerTests.cpp | 38 ++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

(limited to 'src/armnnSerializer')

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 513c74e82d..2b3ec49afd 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -132,7 +132,8 @@ enum LayerType : uint {
     TransposeConvolution2d = 42,
     Resize = 43,
     Stack = 44,
-    QuantizedLstm = 45
+    QuantizedLstm = 45,
+    Abs = 46
 }
 
 // Base layer table to be used as part of other layers
@@ -150,6 +151,11 @@ table BindableLayerBase {
 }
 
 // Table for each layer defined below
+
+table AbsLayer {
+    base:LayerBase;
+}
+
 table ActivationLayer {
     base:LayerBase;
     descriptor:ActivationDescriptor;
@@ -686,7 +692,8 @@ union Layer {
     PreluLayer,
     TransposeConvolution2dLayer,
     ResizeLayer,
-    StackLayer
+    StackLayer,
+    AbsLayer
 }
 
 table AnyLayer {
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index a8d9c23c04..595573c417 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -107,7 +107,10 @@ void SerializerVisitor::VisitOutputLayer(const armnn::IConnectableLayer* layer,
 
 void SerializerVisitor::VisitAbsLayer(const armnn::IConnectableLayer* layer, const char* name)
 {
-    throw UnimplementedException("SerializerVisitor::VisitAbsLayer is not implemented");
+    auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Abs);
+    auto flatBufferAbsLayer  = serializer::CreateAbsLayer(m_flatBufferBuilder, flatBufferBaseLayer);
+
+    CreateAnyLayer(flatBufferAbsLayer.o, serializer::Layer::Layer_AbsLayer);
 }
 
 // Build FlatBuffer for Activation Layer
diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md
index f81aa717e5..9babe25683 100644
--- a/src/armnnSerializer/SerializerSupport.md
+++ b/src/armnnSerializer/SerializerSupport.md
@@ -6,6 +6,7 @@ This reference guide provides a list of layers which can be serialized currently
 
 The Arm NN SDK Serializer currently supports the following layers:
 
+* Abs
 * Activation
 * Addition
 * BatchToSpaceNd
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 79d83f054f..b5ef8c6b4e 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -210,6 +210,44 @@ static std::vector<DataType> GenerateRandomData(size_t size)
 
 BOOST_AUTO_TEST_SUITE(SerializerTests)
 
+BOOST_AUTO_TEST_CASE(SerializeAbs)
+{
+    class AbsLayerVerifier : public LayerVerifierBase
+    {
+    public:
+        AbsLayerVerifier(const std::string& layerName,
+                              const std::vector<armnn::TensorInfo>& inputInfos,
+                              const std::vector<armnn::TensorInfo>& outputInfos)
+                : LayerVerifierBase(layerName, inputInfos, outputInfos) {}
+
+        void VisitAbsLayer(const armnn::IConnectableLayer* layer, const char* name) override
+        {
+            VerifyNameAndConnections(layer, name);
+        }
+    };
+
+    const std::string layerName("abs");
+    const armnn::TensorInfo tensorInfo({1, 2, 3}, armnn::DataType::Float32);
+
+    armnn::INetworkPtr network = armnn::INetwork::Create();
+    armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0);
+
+    armnn::IConnectableLayer* const absLayer = network->AddAbsLayer(layerName.c_str());
+    armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0);
+
+    inputLayer->GetOutputSlot(0).Connect(absLayer->GetInputSlot(0));
+    absLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+
+    inputLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo);
+    absLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo);
+
+    armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+    BOOST_CHECK(deserializedNetwork);
+
+    AbsLayerVerifier verifier(layerName, {tensorInfo}, {tensorInfo});
+    deserializedNetwork->Accept(verifier);
+}
+
 BOOST_AUTO_TEST_CASE(SerializeAddition)
 {
     class AdditionLayerVerifier : public LayerVerifierBase
-- 
cgit v1.2.1