diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-02-28 16:27:30 +0000 |
---|---|---|
committer | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-02-28 16:33:05 +0000 |
commit | 235cea596805ecd074045b33c242cb509b1f647d (patch) | |
tree | 88ce54a4a8abfa6f2fdd991d6776d200e8a2eed6 /src/armnnSerializer | |
parent | 0fe3245e8b8eea98d25cb41bcf9b15c8d4bfa915 (diff) | |
download | armnn-235cea596805ecd074045b33c242cb509b1f647d.tar.gz |
IVGCVSW-2688 Add Serializer and Deserializer for Equal
Change-Id: If613f4394e161483eea4930dab2afba74c5e26fd
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 10 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 10 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.hpp | 3 | ||||
-rw-r--r-- | src/armnnSerializer/SerializerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 42 |
5 files changed, 64 insertions, 2 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 501953c60b..5787f512a2 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -97,7 +97,8 @@ enum LayerType : uint { SpaceToBatchNd = 13, BatchToSpaceNd = 14, Division = 15, - Minimum = 16 + Minimum = 16, + Equal = 17 } // Base layer table to be used as part of other layers @@ -157,6 +158,10 @@ table DivisionLayer { base:LayerBase; } +table EqualLayer { + base:LayerBase; +} + table FullyConnectedLayer { base:LayerBase; descriptor:FullyConnectedDescriptor; @@ -305,7 +310,8 @@ union Layer { SoftmaxLayer, SpaceToBatchNdLayer, DivisionLayer, - MinimumLayer + MinimumLayer, + EqualLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 8b8a88dfbc..05b3691616 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -276,6 +276,16 @@ void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, CreateAnyLayer(fbMinimumLayer.o, serializer::Layer::Layer_MinimumLayer); } +// Build FlatBuffer for Equal Layer +void SerializerVisitor::VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name) +{ + auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Equal); + + auto flatBufferEqualLayer = serializer::CreateEqualLayer(m_flatBufferBuilder, flatBufferBaseLayer); + + CreateAnyLayer(flatBufferEqualLayer.o, serializer::Layer::Layer_EqualLayer); +} + // Build FlatBuffer for Multiplication Layer void SerializerVisitor::VisitMultiplicationLayer(const armnn::IConnectableLayer* layer, const char* name) { diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index ecc966cd6c..91180411f5 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -72,6 +72,9 @@ public: void VisitDivisionLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; + void VisitEqualLayer(const armnn::IConnectableLayer* layer, + const char* name = nullptr) override; + void VisitFullyConnectedLayer(const armnn::IConnectableLayer* layer, const armnn::FullyConnectedDescriptor& fullyConnectedDescriptor, const armnn::ConstTensor& weights, diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 31f631030c..426b71ef2b 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -13,6 +13,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Convolution2d * DepthwiseConvolution2d * Division +* Equal * FullyConnected * Minimum * Multiplication diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 4b0077cd65..1d65b1bbfb 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -840,4 +840,46 @@ BOOST_AUTO_TEST_CASE(SerializeDivision) deserializedNetwork->Accept(nameChecker); } +BOOST_AUTO_TEST_CASE(SerializeDeserializeEqual) +{ + class VerifyEqualName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy> + { + public: + void VisitEqualLayer(const armnn::IConnectableLayer*, + const char* name) override + { + BOOST_TEST(name == "EqualLayer"); + } + }; + + const armnn::TensorInfo inputTensorInfo1 = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Float32); + const armnn::TensorInfo inputTensorInfo2 = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Float32); + const armnn::TensorInfo outputTensorInfo = armnn::TensorInfo({2, 1, 2, 4}, armnn::DataType::Boolean); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer1 = network->AddInputLayer(0); + armnn::IConnectableLayer* const inputLayer2 = network->AddInputLayer(1); + armnn::IConnectableLayer* const equalLayer = network->AddEqualLayer("EqualLayer"); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer1->GetOutputSlot(0).Connect(equalLayer->GetInputSlot(0)); + inputLayer1->GetOutputSlot(0).SetTensorInfo(inputTensorInfo1); + inputLayer2->GetOutputSlot(0).Connect(equalLayer->GetInputSlot(1)); + inputLayer2->GetOutputSlot(0).SetTensorInfo(inputTensorInfo2); + equalLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + equalLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + VerifyEqualName nameChecker; + deserializedNetwork->Accept(nameChecker); + + CheckDeserializedNetworkAgainstOriginal(*network, + *deserializedNetwork, + {inputTensorInfo1.GetShape(), inputTensorInfo2.GetShape()}, + {outputTensorInfo.GetShape()}, + {0, 1}); +} + BOOST_AUTO_TEST_SUITE_END() |