diff options
author | Finn Williams <finn.williams@arm.com> | 2019-03-01 11:51:52 +0000 |
---|---|---|
committer | Finn Williams <finn.williams@arm.com> | 2019-03-01 15:22:21 +0000 |
commit | dd2ba7ebf78a75aadd8ddd2ae1a4226ffc4ae4d9 (patch) | |
tree | 9e0b00f2c80f57f3787087bf7377bae0b0a90223 /src/armnnSerializer | |
parent | 8b42a380b5cd4dae367c8bf9a2566985ed92c516 (diff) | |
download | armnn-dd2ba7ebf78a75aadd8ddd2ae1a4226ffc4ae4d9.tar.gz |
IVGCVSW-2689 Serialize / de-serialize the Floor layer
Change-Id: I61177a999092195fbdfdcf810d289969252dd365
Signed-off-by: Finn Williams <finn.williams@arm.com>
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 10 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 8 | ||||
-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, 62 insertions, 2 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 9b23d8508c..4e3180f0ff 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -102,7 +102,8 @@ enum LayerType : uint { Maximum = 18, Normalization = 19, Pad = 20, - Rsqrt = 21 + Rsqrt = 21, + Floor = 22 } // Base layer table to be used as part of other layers @@ -166,6 +167,10 @@ table EqualLayer { base:LayerBase; } +table FloorLayer{ + base:LayerBase; +} + table FullyConnectedLayer { base:LayerBase; descriptor:FullyConnectedDescriptor; @@ -361,7 +366,8 @@ union Layer { MaximumLayer, NormalizationLayer, PadLayer, - RsqrtLayer + RsqrtLayer, + FloorLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 5f9ca13198..d40cdfa591 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -276,6 +276,14 @@ void SerializerVisitor::VisitEqualLayer(const armnn::IConnectableLayer* layer, c CreateAnyLayer(fbEqualLayer.o, serializer::Layer::Layer_EqualLayer); } +void SerializerVisitor::VisitFloorLayer(const armnn::IConnectableLayer *layer, const char *name) +{ + auto flatBufferFloorBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Floor); + auto flatBufferFloorLayer = serializer::CreateFloorLayer(m_flatBufferBuilder, flatBufferFloorBaseLayer); + + CreateAnyLayer(flatBufferFloorLayer.o, serializer::Layer::Layer_FloorLayer); +} + void SerializerVisitor::VisitMinimumLayer(const armnn::IConnectableLayer* layer, const char* name) { auto fbMinimumBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Minimum); diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 6e92a067b6..bf599b1a1f 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -75,6 +75,9 @@ public: void VisitEqualLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; + void VisitFloorLayer(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 b9bc0d4479..b5a322f525 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -14,6 +14,7 @@ The Arm NN SDK Serializer currently supports the following layers: * DepthwiseConvolution2d * Division * Equal +* Floor * FullyConnected * Maximum * Minimum diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 515689a777..5f1745bda5 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -255,6 +255,48 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeConstant) {commonTensorInfo.GetShape()}); } +BOOST_AUTO_TEST_CASE(SerializeFloor) +{ + class VerifyFloorName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy> + { + public: + void VisitMultiplicationLayer(const armnn::IConnectableLayer*, const char* name) override + { + BOOST_TEST(name == "floor"); + } + }; + + const armnn::TensorInfo info({4,4}, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(1); + + const char* floorLayerName = "floor"; + + armnn::IConnectableLayer* const floorLayer = network->AddFloorLayer(floorLayerName); + inputLayer->GetOutputSlot(0).Connect(floorLayer->GetInputSlot(0)); + + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + floorLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer->GetOutputSlot(0).SetTensorInfo(info); + floorLayer->GetOutputSlot(0).SetTensorInfo(info); + + armnnSerializer::Serializer serializer; + serializer.Serialize(*network); + + std::stringstream stream; + serializer.SaveSerializedToStream(stream); + BOOST_TEST(stream.str().length() > 0); + BOOST_TEST(stream.str().find(floorLayerName) != stream.str().npos); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(stream.str()); + BOOST_CHECK(deserializedNetwork); + + VerifyFloorName nameChecker; + deserializedNetwork->Accept(nameChecker); +} + BOOST_AUTO_TEST_CASE(SerializeMinimum) { class VerifyMinimumName : public armnn::LayerVisitorBase<armnn::VisitorNoThrowPolicy> |