From 452869973b9a45c9c44820d16f92f7dfc96e9aef Mon Sep 17 00:00:00 2001 From: Nattapat Chaimanowong Date: Tue, 26 Feb 2019 15:53:02 +0000 Subject: IVGCVSW-2708 Add Serializer and Deserializer SpaceToBatchNd Change-Id: I14f2a660654dc87939fe413fafa9384f09594f68 Signed-off-by: Nattapat Chaimanowong --- src/armnnSerializer/ArmnnSchema.fbs | 17 ++++++++-- src/armnnSerializer/Serializer.cpp | 29 ++++++++++++++++++ src/armnnSerializer/Serializer.hpp | 4 +++ src/armnnSerializer/SerializerSupport.md | 1 + src/armnnSerializer/test/SerializerTests.cpp | 46 ++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 2 deletions(-) (limited to 'src/armnnSerializer') diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index db70e7bd4c..c1e4e3826a 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -93,7 +93,8 @@ enum LayerType : uint { Activation = 9, Permute = 10, FullyConnected = 11, - Constant = 12 + Constant = 12, + SpaceToBatchNd = 13 } // Base layer table to be used as part of other layers @@ -254,6 +255,17 @@ table PermuteDescriptor { dimMappings:[uint]; } +table SpaceToBatchNdLayer { + base:LayerBase; + descriptor:SpaceToBatchNdDescriptor; +} + +table SpaceToBatchNdDescriptor { + blockShape:[uint]; + padList:[uint]; + dataLayout:DataLayout; +} + union Layer { ActivationLayer, AdditionLayer, @@ -267,7 +279,8 @@ union Layer { PermuteLayer, Pooling2dLayer, ReshapeLayer, - SoftmaxLayer + SoftmaxLayer, + SpaceToBatchNdLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index b8f5c3b555..1c1cefd455 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -380,6 +380,35 @@ void SerializerVisitor::VisitFullyConnectedLayer(const armnn::IConnectableLayer* CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_FullyConnectedLayer); } +// Build FlatBuffer for SpaceToBatchNd Layer +void SerializerVisitor::VisitSpaceToBatchNdLayer(const armnn::IConnectableLayer* layer, + const armnn::SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor, + const char* name) +{ + // Create FlatBuffer BaseLayer + auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_SpaceToBatchNd); + + std::vector padList; + padList.reserve(spaceToBatchNdDescriptor.m_PadList.size()*2); + for (auto& pad : spaceToBatchNdDescriptor.m_PadList) + { + padList.push_back(pad.first); + padList.push_back(pad.second); + } + + auto flatBufferDescriptor = + CreateSpaceToBatchNdDescriptor(m_flatBufferBuilder, + m_flatBufferBuilder.CreateVector(spaceToBatchNdDescriptor.m_BlockShape), + m_flatBufferBuilder.CreateVector(padList), + GetFlatBufferDataLayout(spaceToBatchNdDescriptor.m_DataLayout)); + + auto flatBufferLayer = serializer::CreateSpaceToBatchNdLayer(m_flatBufferBuilder, + flatBufferBaseLayer, + flatBufferDescriptor); + + CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_SpaceToBatchNdLayer); +} + fb::Offset SerializerVisitor::CreateLayerBase(const IConnectableLayer* layer, const serializer::LayerType layerType) { diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 781648fa62..a86e04f05d 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -98,6 +98,10 @@ public: const armnn::SoftmaxDescriptor& softmaxDescriptor, const char* name = nullptr) override; + void VisitSpaceToBatchNdLayer(const armnn::IConnectableLayer* layer, + const armnn::SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor, + const char* name = nullptr) override; + private: /// Creates the Input Slots and Output Slots and LayerBase for the layer. diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 9e84b63adc..776f6129bd 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -17,5 +17,6 @@ The Arm NN SDK Serializer currently supports the following layers: * Pooling2d * Reshape * Softmax +* SpaceToBatchNd More machine learning layers will be supported in future releases. diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index 4e90dbe9e1..f64c14a184 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -636,4 +636,50 @@ BOOST_AUTO_TEST_CASE(SerializeDeserializeFullyConnected) outputInfo.GetShape()); } +BOOST_AUTO_TEST_CASE(SerializeDeserializeSpaceToBatchNd) +{ + class VerifySpaceToBatchNdName : public armnn::LayerVisitorBase + { + public: + void VisitSpaceToBatchNdLayer(const armnn::IConnectableLayer*, + const armnn::SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor, + const char* name) override + { + BOOST_TEST(name == "SpaceToBatchNdLayer"); + } + }; + + unsigned int inputShape[] = {2, 1, 2, 4}; + unsigned int outputShape[] = {8, 1, 1, 3}; + + armnn::SpaceToBatchNdDescriptor desc; + desc.m_DataLayout = armnn::DataLayout::NCHW; + desc.m_BlockShape = {2, 2}; + desc.m_PadList = {{0, 0}, {2, 0}}; + + auto inputTensorInfo = armnn::TensorInfo(4, inputShape, armnn::DataType::Float32); + auto outputTensorInfo = armnn::TensorInfo(4, outputShape, armnn::DataType::Float32); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); + armnn::IConnectableLayer* const spaceToBatchNdLayer = network->AddSpaceToBatchNdLayer(desc, "SpaceToBatchNdLayer"); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer->GetOutputSlot(0).Connect(spaceToBatchNdLayer->GetInputSlot(0)); + inputLayer->GetOutputSlot(0).SetTensorInfo(inputTensorInfo); + spaceToBatchNdLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + spaceToBatchNdLayer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + VerifySpaceToBatchNdName nameChecker; + deserializedNetwork->Accept(nameChecker); + + CheckDeserializedNetworkAgainstOriginal(*network, + *deserializedNetwork, + inputTensorInfo.GetShape(), + outputTensorInfo.GetShape()); +} + BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.1