IVGCVSW-4010 Add serialization support for StandInLayer

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I2017c15b485b82437c6ffdac4d3112bcc2cbe9e9

4 files changed, 58 insertions, 3 deletions

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index 0756784cd3..bad95cfc56 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -144,7 +144,8 @@ enum LayerType : uint {
     DepthToSpace = 49,
     InstanceNormalization = 50,
     LogSoftmax = 51,
-    Comparison = 52
+    Comparison = 52,
+    StandIn = 53
 }
 
 // Base layer table to be used as part of other layers
@@ -731,6 +732,16 @@ table StackDescriptor {
     inputShape:[uint];
 }
 
+table StandInDescriptor {
+    numInputs:uint;
+    numOutputs:uint;
+}
+
+table StandInLayer {
+    base:LayerBase;
+    descriptor:StandInDescriptor;
+}
+
 union Layer {
     ActivationLayer,
     AdditionLayer,
@@ -784,7 +795,8 @@ union Layer {
     DepthToSpaceLayer,
     InstanceNormalizationLayer,
     LogSoftmaxLayer,
-    ComparisonLayer
+    ComparisonLayer,
+    StandInLayer
 }
 
 table AnyLayer {
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index d147d47f41..81091bca85 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -1094,7 +1094,14 @@ void SerializerVisitor::VisitStandInLayer(const armnn::IConnectableLayer *layer,
                                           const armnn::StandInDescriptor& standInDescriptor,
                                           const char *name)
 {
-    // TODO: IVGCVSW-4010 Implement serialization
+    auto fbDescriptor = serializer::CreateStandInDescriptor(m_flatBufferBuilder,
+                                                            standInDescriptor.m_NumInputs,
+                                                            standInDescriptor.m_NumOutputs);
+
+    auto fbBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_StandIn);
+    auto fbLayer     = serializer::CreateStandInLayer(m_flatBufferBuilder, fbBaseLayer, fbDescriptor);
+
+    CreateAnyLayer(fbLayer.o, serializer::Layer::Layer_StandInLayer);
 }
 
 void SerializerVisitor::VisitStridedSliceLayer(const armnn::IConnectableLayer* layer,
diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md
index 4b12f9ca23..4fc880a856 100644
--- a/src/armnnSerializer/SerializerSupport.md
+++ b/src/armnnSerializer/SerializerSupport.md
@@ -50,6 +50,7 @@ The Arm NN SDK Serializer currently supports the following layers:
 * SpaceToDepth
 * Splitter
 * Stack
+* StandIn
 * StridedSlice
 * Subtraction
 * Switch
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 10627d08ba..1f97e935ad 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -2289,6 +2289,41 @@ BOOST_AUTO_TEST_CASE(SerializeStack)
     deserializedNetwork->Accept(verifier);
 }
 
+BOOST_AUTO_TEST_CASE(SerializeStandIn)
+{
+    DECLARE_LAYER_VERIFIER_CLASS_WITH_DESCRIPTOR(StandIn)
+
+    const std::string layerName("standIn");
+
+    armnn::TensorInfo tensorInfo({ 1u }, armnn::DataType::Float32);
+    armnn::StandInDescriptor descriptor(2u, 2u);
+
+    armnn::INetworkPtr network = armnn::INetwork::Create();
+    armnn::IConnectableLayer* const inputLayer0  = network->AddInputLayer(0);
+    armnn::IConnectableLayer* const inputLayer1  = network->AddInputLayer(1);
+    armnn::IConnectableLayer* const standInLayer = network->AddStandInLayer(descriptor, layerName.c_str());
+    armnn::IConnectableLayer* const outputLayer0 = network->AddOutputLayer(0);
+    armnn::IConnectableLayer* const outputLayer1 = network->AddOutputLayer(1);
+
+    inputLayer0->GetOutputSlot(0).Connect(standInLayer->GetInputSlot(0));
+    inputLayer0->GetOutputSlot(0).SetTensorInfo(tensorInfo);
+
+    inputLayer1->GetOutputSlot(0).Connect(standInLayer->GetInputSlot(1));
+    inputLayer1->GetOutputSlot(0).SetTensorInfo(tensorInfo);
+
+    standInLayer->GetOutputSlot(0).Connect(outputLayer0->GetInputSlot(0));
+    standInLayer->GetOutputSlot(0).SetTensorInfo(tensorInfo);
+
+    standInLayer->GetOutputSlot(1).Connect(outputLayer1->GetInputSlot(0));
+    standInLayer->GetOutputSlot(1).SetTensorInfo(tensorInfo);
+
+    armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+    BOOST_CHECK(deserializedNetwork);
+
+    StandInLayerVerifier verifier(layerName, { tensorInfo, tensorInfo }, { tensorInfo, tensorInfo }, descriptor);
+    deserializedNetwork->Accept(verifier);
+}
+
 BOOST_AUTO_TEST_CASE(SerializeStridedSlice)
 {
     DECLARE_LAYER_VERIFIER_CLASS_WITH_DESCRIPTOR(StridedSlice)