diff options
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 16 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 9 | ||||
-rw-r--r-- | src/armnnSerializer/SerializerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 59 |
4 files changed, 82 insertions, 3 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 97d2780368..6b07510a21 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -139,7 +139,8 @@ enum LayerType : uint { Stack = 44, QuantizedLstm = 45, Abs = 46, - ArgMinMax = 47 + ArgMinMax = 47, + Slice = 48 } // Base layer table to be used as part of other layers @@ -471,6 +472,16 @@ table ResizeBilinearDescriptor { dataLayout:DataLayout; } +table SliceLayer { + base:LayerBase; + descriptor:SliceDescriptor; +} + +table SliceDescriptor { + begin:[uint]; + size:[uint]; +} + table StridedSliceLayer { base:LayerBase; descriptor:StridedSliceDescriptor; @@ -710,7 +721,8 @@ union Layer { ResizeLayer, StackLayer, AbsLayer, - ArgMinMaxLayer + ArgMinMaxLayer, + SliceLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 06bfb91e83..16b7cff808 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -749,7 +749,14 @@ void SerializerVisitor::VisitSliceLayer(const armnn::IConnectableLayer* layer, const armnn::SliceDescriptor& sliceDescriptor, const char* name) { - throw UnimplementedException("SerializerVisitor::VisitSliceLayer is not implemented"); + auto fbSliceBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Slice); + auto fbSliceDescriptor = CreateSliceDescriptor(m_flatBufferBuilder, + m_flatBufferBuilder.CreateVector(sliceDescriptor.m_Begin), + m_flatBufferBuilder.CreateVector(sliceDescriptor.m_Size)); + + auto fbSliceLayer = serializer::CreateSliceLayer(m_flatBufferBuilder, fbSliceBaseLayer, fbSliceDescriptor); + + CreateAnyLayer(fbSliceLayer.o, serializer::Layer::Layer_SliceLayer); } // Build FlatBuffer for Softmax Layer diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 534e9faf5b..136998c3f2 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -42,6 +42,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Resize * ResizeBilinear * Rsqrt +* Slice * Softmax * SpaceToBatchNd * SpaceToDepth diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index bbd5402c7c..d4ad6236b4 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -2259,6 +2259,65 @@ BOOST_AUTO_TEST_CASE(SerializeRsqrt) deserializedNetwork->Accept(verifier); } +BOOST_AUTO_TEST_CASE(SerializeSlice) +{ + class SliceLayerVerifier : public LayerVerifierBase + { + public: + SliceLayerVerifier(const std::string& layerName, + const std::vector<armnn::TensorInfo>& inputInfos, + const std::vector<armnn::TensorInfo>& outputInfos, + const armnn::SliceDescriptor& descriptor) + : LayerVerifierBase(layerName, inputInfos, outputInfos) + , m_Descriptor(descriptor) {} + + void VisitSliceLayer(const armnn::IConnectableLayer* layer, + const armnn::SliceDescriptor& descriptor, + const char* name) override + { + VerifyNameAndConnections(layer, name); + VerifyDescriptor(descriptor); + } + + private: + void VerifyDescriptor(const armnn::SliceDescriptor& descriptor) + { + BOOST_CHECK_EQUAL_COLLECTIONS(descriptor.m_Begin.begin(), descriptor.m_Begin.end(), + m_Descriptor.m_Begin.begin(), m_Descriptor.m_Begin.end()); + + BOOST_CHECK_EQUAL_COLLECTIONS(descriptor.m_Size.begin(), descriptor.m_Size.end(), + m_Descriptor.m_Size.begin(), m_Descriptor.m_Size.end()); + } + + armnn::SliceDescriptor m_Descriptor; + }; + + const std::string layerName{"slice"}; + + const armnn::TensorInfo inputInfo = armnn::TensorInfo({3, 2, 3, 1}, armnn::DataType::Float32); + const armnn::TensorInfo outputInfo = armnn::TensorInfo({2, 2, 2, 1}, armnn::DataType::Float32); + + armnn::SliceDescriptor descriptor({ 0, 0, 1, 0}, {2, 2, 2, 1}); + + armnn::INetworkPtr network = armnn::INetwork::Create(); + + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); + armnn::IConnectableLayer* const sliceLayer = network->AddSliceLayer(descriptor, layerName.c_str()); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer->GetOutputSlot(0).Connect(sliceLayer->GetInputSlot(0)); + sliceLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer->GetOutputSlot(0).SetTensorInfo(inputInfo); + sliceLayer->GetOutputSlot(0).SetTensorInfo(outputInfo); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + SliceLayerVerifier verifier(layerName, {inputInfo}, {outputInfo}, descriptor); + deserializedNetwork->Accept(verifier); +} + BOOST_AUTO_TEST_CASE(SerializeSoftmax) { class SoftmaxLayerVerifier : public LayerVerifierBase |