IVGCVSW-2639 Add Serializer & Deserializer for Fully Connected

 * Added FullyConnectedLayer to Serializer Schema Schema.fbs
 * Added FullyConnected serialization and deserialization support
 * Added FullyConnected serialization and deserialization unit tests

Change-Id: I8ef14f9728158f849fa4d1a8d05a1a4170cd5b41
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>

1 files changed, 38 insertions, 1 deletions

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index e1d22ec406..b4afd37b99 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -324,7 +324,44 @@ void SerializerVisitor::VisitPooling2dLayer(const armnn::IConnectableLayer* laye
     CreateAnyLayer(fbPooling2dLayer.o, serializer::Layer::Layer_Pooling2dLayer);
 }
 
-fb::Offset<serializer::LayerBase> SerializerVisitor::CreateLayerBase(const armnn::IConnectableLayer* layer,
+// Build FlatBuffer for FullyConnected Layer
+void SerializerVisitor::VisitFullyConnectedLayer(const armnn::IConnectableLayer* layer,
+                                                 const armnn::FullyConnectedDescriptor& fullyConnectedDescriptor,
+                                                 const armnn::ConstTensor& weights,
+                                                 const armnn::Optional<armnn::ConstTensor>& biases,
+                                                 const char* name)
+{
+    // Create FlatBuffer BaseLayer
+    auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_FullyConnected);
+
+    // Create FlatBuffer FullyConnectedDescriptor
+    auto flatBufferDescriptor =
+        serializer::CreateFullyConnectedDescriptor(m_flatBufferBuilder,
+                                                   fullyConnectedDescriptor.m_BiasEnabled,
+                                                   fullyConnectedDescriptor.m_TransposeWeightMatrix);
+
+    // Create FlatBuffer weights data
+    auto flatBufferWeights = CreateConstTensorInfo(weights);
+
+    // Create FlatBuffer bias data
+    flatbuffers::Offset<serializer::ConstTensor> flatBufferBiases;
+    if (fullyConnectedDescriptor.m_BiasEnabled)
+    {
+        flatBufferBiases = CreateConstTensorInfo(biases.value());
+    }
+
+    // Create FlatBuffer FullyConnectedLayer
+    auto flatBufferLayer = serializer::CreateFullyConnectedLayer(m_flatBufferBuilder,
+                                                                 flatBufferBaseLayer,
+                                                                 flatBufferDescriptor,
+                                                                 flatBufferWeights,
+                                                                 flatBufferBiases);
+
+    // Add created FullyConnectedLayer to the FlatBufferLayers
+    CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_FullyConnectedLayer);
+}
+
+fb::Offset<serializer::LayerBase> SerializerVisitor::CreateLayerBase(const IConnectableLayer* layer,
                                                                      const serializer::LayerType layerType)
 {
     std::vector<fb::Offset<serializer::InputSlot>> inputSlots = CreateInputSlots(layer);