IVGCVSW-2710 Add Serializer and Deserializer for StridedSlice

Change-Id: I6e8198a2aa5f8c56f00ccf9b4d98fcd208755654
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>

5 files changed, 94 insertions, 2 deletions

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 9f1d8ecc9f..ed3de83f55 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -107,7 +107,8 @@ enum LayerType : uint {
     BatchNormalization = 23,
     Greater = 24,
     ResizeBilinear = 25,
-    Subtraction = 26
+    Subtraction = 26,
+    StridedSlice = 27
 }
 
 // Base layer table to be used as part of other layers
@@ -381,6 +382,23 @@ table ResizeBilinearDescriptor {
     dataLayout:DataLayout;
 }
 
+table StridedSliceLayer {
+    base:LayerBase;
+    descriptor:StridedSliceDescriptor;
+}
+
+table StridedSliceDescriptor {
+    begin:[int];
+    end:[int];
+    stride:[int];
+    beginMask:int;
+    endMask:int;
+    shrinkAxisMask:int;
+    ellipsisMask:int;
+    newAxisMask:int;
+    dataLayout:DataLayout;
+}
+
 union Layer {
     ActivationLayer,
     AdditionLayer,
@@ -408,7 +426,8 @@ union Layer {
     FloorLayer,
     GreaterLayer,
     ResizeBilinearLayer,
-    SubtractionLayer
+    SubtractionLayer,
+    StridedSliceLayer
 }
 
 table AnyLayer {
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 93231d0366..9653908493 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -588,6 +588,31 @@ void SerializerVisitor::VisitNormalizationLayer(const armnn::IConnectableLayer*
     CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_NormalizationLayer);
 }
 
+void SerializerVisitor::VisitStridedSliceLayer(const armnn::IConnectableLayer* layer,
+                                               const armnn::StridedSliceDescriptor& stridedSliceDescriptor,
+                                               const char* name)
+{
+    auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_StridedSlice);
+
+    auto flatBufferDescriptor =
+        CreateStridedSliceDescriptor(m_flatBufferBuilder,
+                                     m_flatBufferBuilder.CreateVector(stridedSliceDescriptor.m_Begin),
+                                     m_flatBufferBuilder.CreateVector(stridedSliceDescriptor.m_End),
+                                     m_flatBufferBuilder.CreateVector(stridedSliceDescriptor.m_Stride),
+                                     stridedSliceDescriptor.m_BeginMask,
+                                     stridedSliceDescriptor.m_EndMask,
+                                     stridedSliceDescriptor.m_ShrinkAxisMask,
+                                     stridedSliceDescriptor.m_EllipsisMask,
+                                     stridedSliceDescriptor.m_NewAxisMask,
+                                     GetFlatBufferDataLayout(stridedSliceDescriptor.m_DataLayout));
+
+    auto flatBufferLayer = serializer::CreateStridedSliceLayer(m_flatBufferBuilder,
+                                                               flatBufferBaseLayer,
+                                                               flatBufferDescriptor);
+
+    CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_StridedSliceLayer);
+}
+
 void SerializerVisitor::VisitSubtractionLayer(const armnn::IConnectableLayer* layer, const char* name)
 {
     auto fbSubtractionBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Subtraction);
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index b6f5974265..0dcacc8898 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -147,6 +147,10 @@ public:
                                  const armnn::NormalizationDescriptor& normalizationDescriptor,
                                  const char* name = nullptr) override;
 
+    void VisitStridedSliceLayer(const armnn::IConnectableLayer* layer,
+                                const armnn::StridedSliceDescriptor& stridedSliceDescriptor,
+                                const char* name = nullptr) override;
+
     void VisitSubtractionLayer(const armnn::IConnectableLayer* layer,
                                const char* name = nullptr) override;
 private:
diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md
index 141a6faa45..713b35f78a 100644
--- a/src/armnnSerializer/SerializerSupport.md
+++ b/src/armnnSerializer/SerializerSupport.md
@@ -30,6 +30,7 @@ The Arm NN SDK Serializer currently supports the following layers:
 * Rsqrt
 * Softmax
 * SpaceToBatchNd
+* StridedSlice
 * Subtraction
 
 More machine learning layers will be supported in future releases.
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 572ee80011..5a6806adec 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -1290,4 +1290,47 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeSubtraction)
                                             {0, 1});
 }
 
+BOOST_AUTO_TEST_CASE(SerializeDeserializeStridedSlice)
+{
+    class VerifyStridedSliceName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy>
+    {
+    public:
+        void VisitStridedSliceLayer(const armnn::IConnectableLayer*,
+                                    const armnn::StridedSliceDescriptor& descriptor,
+                                    const char* name) override
+        {
+            BOOST_TEST(name == "StridedSliceLayer");
+        }
+    };
+
+    armnn::StridedSliceDescriptor desc({0, 0, 1, 0}, {1, 1, 1, 1}, {1, 1, 1, 1});
+    desc.m_EndMask = (1 << 4) - 1;
+    desc.m_ShrinkAxisMask = (1 << 1) | (1 << 2);
+    desc.m_DataLayout = armnn::DataLayout::NCHW;
+
+    const armnn::TensorInfo inputTensorInfo = armnn::TensorInfo({3, 2, 3, 1}, armnn::DataType::Float32);
+    const armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({3, 1}, armnn::DataType::Float32);
+
+    armnn::INetworkPtr network = armnn::INetwork::Create();
+    armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0);
+    armnn::IConnectableLayer* const stridedSliceLayer = network->AddStridedSliceLayer(desc, "StridedSliceLayer");
+    armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0);
+
+    inputLayer->GetOutputSlot(0).Connect(stridedSliceLayer->GetInputSlot(0));
+    inputLayer->GetOutputSlot(0).SetTensorInfo(inputTensorInfo);
+    stridedSliceLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+    stridedSliceLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+    armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+    BOOST_CHECK(deserializedNetwork);
+
+    VerifyStridedSliceName nameChecker;
+    deserializedNetwork->Accept(nameChecker);
+
+    CheckDeserializedNetworkAgainstOriginal(*network,
+                                            *deserializedNetwork,
+                                            {inputTensorInfo.GetShape()},
+                                            {outputTensorInfo.GetShape()});
+}
+
 BOOST_AUTO_TEST_SUITE_END()