diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2019-02-12 14:31:45 +0000 |
---|---|---|
committer | Saoirse Stewart Arm <saoirse.stewart@arm.com> | 2019-02-13 09:10:35 +0000 |
commit | 5f45027909bba9f4abeeef6d8a265ed345d564ae (patch) | |
tree | 01bf69ba9db252a99b4dc6feccb20b08aabb7d70 /src/armnnSerializer | |
parent | fb1437e86d8e01af9ee9cebe4c8cd9ff508ac779 (diff) | |
download | armnn-5f45027909bba9f4abeeef6d8a265ed345d564ae.tar.gz |
IVGCVSW-2640 Add Serializer & Deserializer for Mul
* Updated Serializer schema for Multiplication support
* Added support for Multiplication to Serializer and Deserializer
Change-Id: I10ad8ad4b37876a963ccdcf7074cb66f40531bde
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/Schema.fbs | 8 | ||||
-rw-r--r-- | src/armnnSerializer/SeralizerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 14 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.hpp | 3 | ||||
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 26 |
5 files changed, 51 insertions, 1 deletions
diff --git a/src/armnnSerializer/Schema.fbs b/src/armnnSerializer/Schema.fbs index 2527f6d0f6..5d6388d944 100644 --- a/src/armnnSerializer/Schema.fbs +++ b/src/armnnSerializer/Schema.fbs @@ -65,7 +65,8 @@ table OutputSlot { enum LayerType : uint { Addition = 0, Input = 1, - Output = 2 + Multiplication = 2, + Output = 3 } // Base layer table to be used as part of other layers @@ -91,6 +92,10 @@ table InputLayer { base:BindableLayerBase; } +table MultiplicationLayer { + base:LayerBase; +} + table OutputLayer { base:BindableLayerBase; } @@ -98,6 +103,7 @@ table OutputLayer { union Layer { AdditionLayer, InputLayer, + MultiplicationLayer, OutputLayer } diff --git a/src/armnnSerializer/SeralizerSupport.md b/src/armnnSerializer/SeralizerSupport.md index 16d1940be0..5978c8a952 100644 --- a/src/armnnSerializer/SeralizerSupport.md +++ b/src/armnnSerializer/SeralizerSupport.md @@ -7,5 +7,6 @@ This reference guide provides a list of layers which can be serialized currently The Arm NN SDK Serializer currently supports the following layers: * Addition +* Multiplication More machine learning layers will be supported in future releases.
\ No newline at end of file diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 57baf0e28c..acb672ad1f 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -88,6 +88,20 @@ void Serializer::VisitAdditionLayer(const IConnectableLayer* layer, const char* CreateAnyLayer(flatBufferAdditionLayer.o, serializer::Layer::Layer_AdditionLayer); } +// Build FlatBuffer for Multiplication Layer +void Serializer::VisitMultiplicationLayer(const IConnectableLayer* layer, const char* name) +{ + // Create FlatBuffer BaseLayer + auto flatBufferMultiplicationBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Multiplication); + + // Create the FlatBuffer MultiplicationLayer + auto flatBufferMultiplicationLayer = + serializer::CreateMultiplicationLayer(m_flatBufferBuilder, flatBufferMultiplicationBaseLayer); + + // Add the AnyLayer to the FlatBufferLayers + CreateAnyLayer(flatBufferMultiplicationLayer.o, serializer::Layer::Layer_MultiplicationLayer); +} + void Serializer::Serialize(const INetwork& inNetwork) { // Iterate through to network diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 697e5cfaa7..8aec3ca42a 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -29,6 +29,9 @@ public: armnn::LayerBindingId id, const char* name = nullptr) override; + void VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, + const char* name = nullptr) override; + /// Serializes the network to ArmNN SerializedGraph. /// @param [in] inNetwork The network to be serialized. void Serialize(const armnn::INetwork& inNetwork); diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 17ad6e3695..ab4bc0fe0b 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -32,4 +32,30 @@ BOOST_AUTO_TEST_CASE(SimpleNetworkSerialization) BOOST_TEST(stream.str().length() > 0); } +BOOST_AUTO_TEST_CASE(SimpleNetworkWithMultiplicationSerialization) +{ + const armnn::TensorInfo info({ 1, 5, 2, 3 }, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer0 = network->AddInputLayer(0); + armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(1); + + const char* multLayerName = "mult_0"; + + armnn::IConnectableLayer* const multiplicationLayer0 = network->AddMultiplicationLayer(multLayerName); + inputLayer0->GetOutputSlot(0).Connect(multiplicationLayer0->GetInputSlot(0)); + inputLayer1->GetOutputSlot(0).Connect(multiplicationLayer0->GetInputSlot(1)); + + armnn::IConnectableLayer* const outputLayer0 = network->AddOutputLayer(0); + multiplicationLayer0->GetOutputSlot(0).Connect(outputLayer0->GetInputSlot(0)); + + armnnSerializer::Serializer serializer; + serializer.Serialize(*network); + + std::stringstream stream; + serializer.SaveSerializedToStream(stream); + BOOST_TEST(stream.str().length() > 0); + BOOST_TEST(stream.str().find(multLayerName) != stream.str().npos); +} + BOOST_AUTO_TEST_SUITE_END() |