diff options
author | David Monahan <david.monahan@arm.com> | 2023-07-25 12:08:10 +0100 |
---|---|---|
committer | David Monahan <david.monahan@arm.com> | 2023-07-25 11:49:01 +0000 |
commit | 616b22f52b169db10992fd70f4584365fd3db463 (patch) | |
tree | 5f4e4550848ac7c4800e6137466b3970c68565f4 /src/armnnDeserializer | |
parent | 79a06a59bafadf736ca53c4240e87f9bbb657260 (diff) | |
download | armnn-616b22f52b169db10992fd70f4584365fd3db463.tar.gz |
IVGCVSW-7884 - Add Tile to Serializer and Deserializer
* Added parsing functions to the serializer and deserializer
* Added Tile and its Descriptor to the ArmnnSchema.fbs
* Added a Unittest
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: I72e638d26038c9b118cd82f633af462fd19e2b34
Diffstat (limited to 'src/armnnDeserializer')
-rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 30 | ||||
-rw-r--r-- | src/armnnDeserializer/Deserializer.hpp | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 1e40c637cc..eb77f92842 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -276,6 +276,7 @@ m_ParserFunctions(Layer_MAX+1, &IDeserializer::DeserializerImpl::ParseUnsupporte m_ParserFunctions[Layer_StridedSliceLayer] = &DeserializerImpl::ParseStridedSlice; m_ParserFunctions[Layer_SubtractionLayer] = &DeserializerImpl::ParseSubtraction; m_ParserFunctions[Layer_SwitchLayer] = &DeserializerImpl::ParseSwitch; + m_ParserFunctions[Layer_TileLayer] = &DeserializerImpl::ParseTile; m_ParserFunctions[Layer_TransposeConvolution2dLayer] = &DeserializerImpl::ParseTransposeConvolution2d; m_ParserFunctions[Layer_TransposeLayer] = &DeserializerImpl::ParseTranspose; m_ParserFunctions[Layer_UnidirectionalSequenceLstmLayer] = &DeserializerImpl::ParseUnidirectionalSequenceLstm; @@ -423,6 +424,8 @@ LayerBaseRawPtr IDeserializer::DeserializerImpl::GetBaseLayer(const GraphPtr& gr return graphPtr->layers()->Get(layerIndex)->layer_as_SubtractionLayer()->base(); case Layer::Layer_SwitchLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_SwitchLayer()->base(); + case Layer::Layer_TileLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_TileLayer()->base(); case Layer::Layer_TransposeConvolution2dLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_TransposeConvolution2dLayer()->base(); case Layer::Layer_TransposeLayer: @@ -3636,6 +3639,33 @@ void IDeserializer::DeserializerImpl::ParseSwitch(GraphPtr graph, unsigned int l RegisterOutputSlots(graph, layerIndex, layer); } +void IDeserializer::DeserializerImpl::ParseTile(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + auto inputs = GetInputs(graph, layerIndex); + CHECK_LOCATION(); + CHECK_VALID_SIZE(inputs.size(), 1); + + auto outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto TileLayer = graph->layers()->Get(layerIndex)->layer_as_TileLayer(); + auto layerName = GetLayerName(graph, layerIndex); + auto flatBufferDescriptor = TileLayer->descriptor(); + auto flatBufferMultiples = flatBufferDescriptor->m_Multiples(); + + armnn::TileDescriptor tileDescriptor; + tileDescriptor.m_Multiples = std::vector<unsigned int>(flatBufferMultiples->begin(), flatBufferMultiples->end()); + + IConnectableLayer* layer = m_Network->AddTileLayer(tileDescriptor, layerName.c_str()); + + armnn::TensorInfo output0TensorInfo = ToTensorInfo(outputs[0]); + layer->GetOutputSlot(0).SetTensorInfo(output0TensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + void IDeserializer::DeserializerImpl::ParsePrelu(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index b4b93e6fe1..7e427d6dfa 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -149,6 +149,7 @@ private: void ParseStridedSlice(GraphPtr graph, unsigned int layerIndex); void ParseSubtraction(GraphPtr graph, unsigned int layerIndex); void ParseSwitch(GraphPtr graph, unsigned int layerIndex); + void ParseTile(GraphPtr graph, unsigned int layerIndex); void ParseTranspose(GraphPtr graph, unsigned int layerIndex); void ParseTransposeConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseUnidirectionalSequenceLstm(GraphPtr graph, unsigned int layerIndex); |