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>
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index ead4fc5..9ec7835 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -174,6 +174,7 @@
m_ParserFunctions[Layer_AdditionLayer] = &Deserializer::ParseAdd;
m_ParserFunctions[Layer_Convolution2dLayer] = &Deserializer::ParseConvolution2d;
m_ParserFunctions[Layer_DepthwiseConvolution2dLayer] = &Deserializer::ParseDepthwiseConvolution2d;
+ m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected;
m_ParserFunctions[Layer_MultiplicationLayer] = &Deserializer::ParseMultiplication;
m_ParserFunctions[Layer_PermuteLayer] = &Deserializer::ParsePermute;
m_ParserFunctions[Layer_Pooling2dLayer] = &Deserializer::ParsePooling2d;
@@ -195,6 +196,8 @@
return graphPtr->layers()->Get(layerIndex)->layer_as_Convolution2dLayer()->base();
case Layer::Layer_DepthwiseConvolution2dLayer:
return graphPtr->layers()->Get(layerIndex)->layer_as_DepthwiseConvolution2dLayer()->base();
+ case Layer::Layer_FullyConnectedLayer:
+ return graphPtr->layers()->Get(layerIndex)->layer_as_FullyConnectedLayer()->base();
case Layer::Layer_InputLayer:
return graphPtr->layers()->Get(layerIndex)->layer_as_InputLayer()->base()->base();
case Layer::Layer_MultiplicationLayer:
@@ -834,6 +837,50 @@
RegisterOutputSlots(layerIndex, layer);
}
+void Deserializer::ParseFullyConnected(unsigned int layerIndex)
+{
+ CHECK_LAYERS(m_Graph, 0, layerIndex);
+ auto inputs = GetInputs(m_Graph, layerIndex);
+ CHECK_LOCATION();
+ CHECK_VALID_SIZE(inputs.size(), 1);
+
+ auto outputs = GetOutputs(m_Graph, layerIndex);
+ CHECK_VALID_SIZE(outputs.size(), 1);
+
+ auto layerName = boost::str(boost::format("FullyConnected:%1%") % layerIndex);
+
+ auto flatBufferLayer = m_Graph->layers()->Get(layerIndex)->layer_as_FullyConnectedLayer();
+ auto flatBufferDescriptor = flatBufferLayer->descriptor();
+
+ armnn::FullyConnectedDescriptor fullyConnectedDescriptor;
+ fullyConnectedDescriptor.m_BiasEnabled = flatBufferDescriptor->biasEnabled();
+ fullyConnectedDescriptor.m_TransposeWeightMatrix = flatBufferDescriptor->transposeWeightsMatrix();
+
+ armnn::ConstTensor weightsTensor = ToConstTensor(flatBufferLayer->weights());
+
+ armnn::IConnectableLayer* layer;
+ if (flatBufferDescriptor->biasEnabled())
+ {
+ armnn::ConstTensor biasTensorData = ToConstTensor(flatBufferLayer->biases());
+ layer = m_Network->AddFullyConnectedLayer(fullyConnectedDescriptor,
+ weightsTensor,
+ biasTensorData,
+ layerName.c_str());
+ }
+ else
+ {
+ layer = m_Network->AddFullyConnectedLayer(fullyConnectedDescriptor,
+ weightsTensor,
+ layerName.c_str());
+ }
+
+ armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]);
+ layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+ RegisterInputSlots(layerIndex, layer);
+ RegisterOutputSlots(layerIndex, layer);
+}
+
void Deserializer::ParsePermute(unsigned int layerIndex)
{
CHECK_LAYERS(m_Graph, 0, layerIndex);
diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp
index 6af1afb..25c651a 100644
--- a/src/armnnDeserializer/Deserializer.hpp
+++ b/src/armnnDeserializer/Deserializer.hpp
@@ -72,6 +72,7 @@
void ParseAdd(unsigned int layerIndex);
void ParseConvolution2d(unsigned int layerIndex);
void ParseDepthwiseConvolution2d(unsigned int layerIndex);
+ void ParseFullyConnected(unsigned int layerIndex);
void ParseMultiplication(unsigned int layerIndex);
void ParsePermute(unsigned int layerIndex);
void ParsePooling2d(unsigned int layerIndex);
diff --git a/src/armnnDeserializer/test/DeserializeFullyConnected.cpp b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp
new file mode 100644
index 0000000..77d0acc
--- /dev/null
+++ b/src/armnnDeserializer/test/DeserializeFullyConnected.cpp
@@ -0,0 +1,140 @@
+//
+// Copyright © 2017 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include <boost/test/unit_test.hpp>
+#include "ParserFlatbuffersSerializeFixture.hpp"
+#include "../Deserializer.hpp"
+
+#include <string>
+#include <iostream>
+
+BOOST_AUTO_TEST_SUITE(DeserializeParser)
+
+struct FullyConnectedFixture : public ParserFlatbuffersSerializeFixture
+{
+ explicit FullyConnectedFixture(const std::string & inputShape1,
+ const std::string & outputShape,
+ const std::string & weightsShape,
+ const std::string & dataType)
+ {
+ m_JsonString = R"(
+ {
+ inputIds: [0],
+ outputIds: [2],
+ layers: [{
+ layer_type: "InputLayer",
+ layer: {
+ base: {
+ layerBindingId: 0,
+ base: {
+ index: 0,
+ layerName: "InputLayer",
+ layerType: "Input",
+ inputSlots: [{
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ }],
+ outputSlots: [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + inputShape1 + R"(,
+ dataType: )" + dataType + R"(,
+ quantizationScale: 1.0,
+ quantizationOffset: 0
+ },
+ }]
+ },
+ }
+ },
+ },
+ {
+ layer_type: "FullyConnectedLayer",
+ layer : {
+ base: {
+ index:1,
+ layerName: "FullyConnectedLayer",
+ layerType: "FullyConnected",
+ inputSlots: [{
+ index: 0,
+ connection: {sourceLayerIndex:0, outputSlotIndex:0 },
+ }],
+ outputSlots: [{
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + outputShape + R"(,
+ dataType: )" + dataType + R"(,
+ quantizationScale: 2.0,
+ quantizationOffset: 0
+ },
+ }],
+ },
+ descriptor: {
+ biasEnabled: false,
+ transposeWeightsMatrix: true
+ },
+ weights: {
+ info: {
+ dimensions: )" + weightsShape + R"(,
+ dataType: )" + dataType + R"(,
+ quantizationScale: 1.0,
+ quantizationOffset: 0
+ },
+ data_type: ByteData,
+ data: {
+ data: [
+ 2, 3, 4, 5
+ ],
+ }
+ }
+ },
+ },
+ {
+ layer_type: "OutputLayer",
+ layer: {
+ base:{
+ layerBindingId: 0,
+ base: {
+ index: 2,
+ layerName: "OutputLayer",
+ layerType: "Output",
+ inputSlots: [{
+ index: 0,
+ connection: {sourceLayerIndex:1, outputSlotIndex:0 },
+ }],
+ outputSlots: [ {
+ index: 0,
+ tensorInfo: {
+ dimensions: )" + outputShape + R"(,
+ dataType: )" + dataType + R"(
+ },
+ }],
+ }
+ }},
+ }]
+ }
+ )";
+ Setup();
+ }
+};
+
+struct FullyConnectedWithNoBiasFixture : FullyConnectedFixture
+{
+ FullyConnectedWithNoBiasFixture()
+ : FullyConnectedFixture("[ 1, 4, 1, 1 ]", // inputShape
+ "[ 1, 1 ]", // outputShape
+ "[ 1, 4 ]", // filterShape
+ "QuantisedAsymm8") // filterData
+ {}
+};
+
+BOOST_FIXTURE_TEST_CASE(FullyConnectedWithNoBias, FullyConnectedWithNoBiasFixture)
+{
+ RunTest<2, armnn::DataType::QuantisedAsymm8>(
+ 0,
+ {{"InputLayer", { 10, 20, 30, 40 }}},
+ {{"OutputLayer", { 400/2 }}});
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/armnnSerializer/Schema.fbs b/src/armnnSerializer/Schema.fbs
index 94ca23b..dc14069 100644
--- a/src/armnnSerializer/Schema.fbs
+++ b/src/armnnSerializer/Schema.fbs
@@ -91,7 +91,8 @@
Convolution2d = 7,
DepthwiseConvolution2d = 8,
Activation = 9,
- Permute = 10
+ Permute = 10,
+ FullyConnected = 11
}
// Base layer table to be used as part of other layers
@@ -142,6 +143,18 @@
dataLayout:DataLayout = NCHW;
}
+table FullyConnectedLayer {
+ base:LayerBase;
+ descriptor:FullyConnectedDescriptor;
+ weights:ConstTensor;
+ biases:ConstTensor;
+}
+
+table FullyConnectedDescriptor {
+ biasEnabled:bool = false;
+ transposeWeightsMatrix:bool = false;
+}
+
table InputLayer {
base:BindableLayerBase;
}
@@ -240,6 +253,7 @@
AdditionLayer,
Convolution2dLayer,
DepthwiseConvolution2dLayer,
+ FullyConnectedLayer,
InputLayer,
MultiplicationLayer,
OutputLayer,
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index e1d22ec..b4afd37 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -324,7 +324,44 @@
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);
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index 329b005..0a62732 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -61,6 +61,12 @@
const armnn::Optional<armnn::ConstTensor>& biases,
const char* name = nullptr) override;
+ void VisitFullyConnectedLayer(const armnn::IConnectableLayer* layer,
+ const armnn::FullyConnectedDescriptor& fullyConnectedDescriptor,
+ const armnn::ConstTensor& weights,
+ const armnn::Optional<armnn::ConstTensor>& biases,
+ const char* name = nullptr) override;
+
void VisitInputLayer(const armnn::IConnectableLayer* layer,
armnn::LayerBindingId id,
const char* name = nullptr) override;
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 822f9c7..ede24ba 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -404,4 +404,45 @@
outputTensorInfo.GetShape());
}
+BOOST_AUTO_TEST_CASE(SerializeDeserializeFullyConnected)
+{
+ armnn::TensorInfo inputInfo ({ 2, 5, 1, 1 }, armnn::DataType::Float32);
+ armnn::TensorInfo outputInfo({ 2, 3 }, armnn::DataType::Float32);
+
+ armnn::TensorInfo weightsInfo({ 5, 3 }, armnn::DataType::Float32);
+ armnn::TensorInfo biasesInfo ({ 3 }, armnn::DataType::Float32);
+
+ armnn::FullyConnectedDescriptor descriptor;
+ descriptor.m_BiasEnabled = true;
+ descriptor.m_TransposeWeightMatrix = false;
+
+ std::vector<float> weightsData = GenerateRandomData<float>(weightsInfo.GetNumElements());
+ std::vector<float> biasesData = GenerateRandomData<float>(biasesInfo.GetNumElements());
+
+ armnn::ConstTensor weights(weightsInfo, weightsData);
+ armnn::ConstTensor biases(biasesInfo, biasesData);
+
+ armnn::INetworkPtr network = armnn::INetwork::Create();
+ armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0, "input");
+ armnn::IConnectableLayer* const fullyConnectedLayer = network->AddFullyConnectedLayer(descriptor,
+ weights,
+ biases,
+ "fully_connected");
+ armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0, "output");
+
+ inputLayer->GetOutputSlot(0).Connect(fullyConnectedLayer->GetInputSlot(0));
+ inputLayer->GetOutputSlot(0).SetTensorInfo(inputInfo);
+
+ fullyConnectedLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+ fullyConnectedLayer->GetOutputSlot(0).SetTensorInfo(outputInfo);
+
+ armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+ BOOST_CHECK(deserializedNetwork);
+
+ CheckDeserializedNetworkAgainstOriginal(*network,
+ *deserializedNetwork,
+ inputInfo.GetShape(),
+ outputInfo.GetShape());
+}
+
BOOST_AUTO_TEST_SUITE_END()