diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-09-18 13:36:52 +0100 |
---|---|---|
committer | Nikhil Raj Arm <nikhil.raj@arm.com> | 2019-09-19 15:42:10 +0000 |
commit | 2fda80b2f3b81f89e5748404041786f0a6c3735f (patch) | |
tree | b91b412ce46eb9ffe1dbee1826916839cdacd3df /src/armnnDeserializer/Deserializer.cpp | |
parent | 75ae2b026c99896ec0aa574ff985992ff422c3b2 (diff) | |
download | armnn-2fda80b2f3b81f89e5748404041786f0a6c3735f.tar.gz |
IVGCVSW-3880 Add serialization support for SLICE
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I5eaf61cfd2c875805d2f37cd967d75ad1d20ad6d
Diffstat (limited to 'src/armnnDeserializer/Deserializer.cpp')
-rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 1dab9bf74f..1c4d86cf34 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -222,6 +222,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_ResizeBilinearLayer] = &Deserializer::ParseResizeBilinear; m_ParserFunctions[Layer_ResizeLayer] = &Deserializer::ParseResize; m_ParserFunctions[Layer_RsqrtLayer] = &Deserializer::ParseRsqrt; + m_ParserFunctions[Layer_SliceLayer] = &Deserializer::ParseSlice; m_ParserFunctions[Layer_SoftmaxLayer] = &Deserializer::ParseSoftmax; m_ParserFunctions[Layer_SpaceToBatchNdLayer] = &Deserializer::ParseSpaceToBatchNd; m_ParserFunctions[Layer_SpaceToDepthLayer] = &Deserializer::ParseSpaceToDepth; @@ -317,6 +318,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_ResizeLayer()->base(); case Layer::Layer_RsqrtLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_RsqrtLayer()->base(); + case Layer::Layer_SliceLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_SliceLayer()->base(); case Layer::Layer_SoftmaxLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_SoftmaxLayer()->base(); case Layer::Layer_SpaceToBatchNdLayer: @@ -338,8 +341,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt case Layer::Layer_NONE: default: throw ParseException(boost::str( - boost::format("Layer must have a type %1%") % - Layer::Layer_NONE)); + boost::format("Layer type %1% not recognized") % + layerType)); } } @@ -1989,6 +1992,41 @@ void Deserializer::ParseRsqrt(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseSlice(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + + auto inputs = GetInputs(graph, layerIndex); + CHECK_VALID_SIZE(inputs.size(), 1); + + auto outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto fbDescriptor = graph->layers()->Get(layerIndex)->layer_as_SliceLayer()->descriptor(); + + auto fbBegin = fbDescriptor->begin(); + auto fbSize = fbDescriptor->size(); + + if (fbBegin->Length() != fbSize->Length()) + { + throw ParseException(boost::str( + boost::format("Begin and size descriptors must have the same length %1%") % CHECK_LOCATION().AsString())); + } + + armnn::SliceDescriptor descriptor; + descriptor.m_Begin.insert(descriptor.m_Begin.end(), fbBegin->begin(), fbBegin->end()); + descriptor.m_Size.insert(descriptor.m_Size.end(), fbSize->begin(), fbSize->end()); + + auto layerName = GetLayerName(graph, layerIndex); + IConnectableLayer* layer = m_Network->AddSliceLayer(descriptor, layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + void Deserializer::ParseStridedSlice(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); |