diff options
author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2019-02-26 15:53:02 +0000 |
---|---|---|
committer | derek.lamberti <derek.lamberti@arm.com> | 2019-02-26 16:49:44 +0000 |
commit | 452869973b9a45c9c44820d16f92f7dfc96e9aef (patch) | |
tree | fe4c176852db25435da8865008c626cbd064d7bf /src/armnnDeserializer/Deserializer.cpp | |
parent | 07d58c77e174a8e041c1facc61637e85c6cc0bf6 (diff) | |
download | armnn-452869973b9a45c9c44820d16f92f7dfc96e9aef.tar.gz |
IVGCVSW-2708 Add Serializer and Deserializer SpaceToBatchNd
Change-Id: I14f2a660654dc87939fe413fafa9384f09594f68
Signed-off-by: Nattapat Chaimanowong <nattapat.chaimanowong@arm.com>
Diffstat (limited to 'src/armnnDeserializer/Deserializer.cpp')
-rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index b263c3a769..64f8e44429 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -196,6 +196,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_Pooling2dLayer] = &Deserializer::ParsePooling2d; m_ParserFunctions[Layer_ReshapeLayer] = &Deserializer::ParseReshape; m_ParserFunctions[Layer_SoftmaxLayer] = &Deserializer::ParseSoftmax; + m_ParserFunctions[Layer_SpaceToBatchNdLayer] = &Deserializer::ParseSpaceToBatchNd; } Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPtr, unsigned int layerIndex) @@ -230,6 +231,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_ReshapeLayer()->base(); case Layer::Layer_SoftmaxLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_SoftmaxLayer()->base(); + case Layer::Layer_SpaceToBatchNdLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_SpaceToBatchNdLayer()->base(); case Layer::Layer_NONE: default: throw ParseException(boost::str( @@ -1176,4 +1179,47 @@ void Deserializer::ParseSoftmax(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseSpaceToBatchNd(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + + Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + CHECK_VALID_SIZE(inputs.size(), 1); + + Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_SpaceToBatchNdLayer()->descriptor(); + auto flatBufferPadList = flatBufferDescriptor->padList(); + auto flatBufferBlockShape = flatBufferDescriptor->blockShape(); + + if (flatBufferPadList->Length() % 2 != 0) + { + throw ParseException(boost::str( + boost::format("The size of the pad list must be divisible by 2 %1%") % CHECK_LOCATION().AsString())); + } + + std::vector<std::pair<unsigned int, unsigned int>> padList; + padList.reserve(flatBufferPadList->Length() / 2); + for (unsigned int i = 0; i < flatBufferPadList->Length() - 1; i += 2) + { + padList.emplace_back(flatBufferPadList->Get(i), flatBufferPadList->Get(i+1)); + } + + armnn::SpaceToBatchNdDescriptor descriptor; + descriptor.m_DataLayout = ToDataLayout(flatBufferDescriptor->dataLayout()); + descriptor.m_BlockShape = + std::vector<unsigned int>(flatBufferBlockShape->begin(), flatBufferBlockShape->end()); + descriptor.m_PadList = padList; + + auto layerName = GetLayerName(graph, layerIndex); + IConnectableLayer* layer = m_Network->AddSpaceToBatchNdLayer(descriptor, layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + } // namespace armnnDeserializer |