diff options
Diffstat (limited to 'src/armnnDeserializer')
-rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 33 | ||||
-rw-r--r-- | src/armnnDeserializer/Deserializer.hpp | 1 | ||||
-rw-r--r-- | src/armnnDeserializer/DeserializerSupport.md | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 6779f1eb06..92212b654a 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -232,6 +232,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_SpaceToDepthLayer] = &Deserializer::ParseSpaceToDepth; m_ParserFunctions[Layer_SplitterLayer] = &Deserializer::ParseSplitter; m_ParserFunctions[Layer_StackLayer] = &Deserializer::ParseStack; + m_ParserFunctions[Layer_StandInLayer] = &Deserializer::ParseStandIn; m_ParserFunctions[Layer_StridedSliceLayer] = &Deserializer::ParseStridedSlice; m_ParserFunctions[Layer_SubtractionLayer] = &Deserializer::ParseSubtraction; m_ParserFunctions[Layer_SwitchLayer] = &Deserializer::ParseSwitch; @@ -342,6 +343,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_SplitterLayer()->base(); case Layer::Layer_StackLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_StackLayer()->base(); + case Layer::Layer_StandInLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_StandInLayer()->base(); case Layer::Layer_StridedSliceLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_StridedSliceLayer()->base(); case Layer::Layer_SubtractionLayer: @@ -2685,4 +2688,34 @@ void Deserializer::ParseStack(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseStandIn(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + + auto inputs = GetInputs(graph, layerIndex); + auto outputs = GetOutputs(graph, layerIndex); + + auto fbLayer = graph->layers()->Get(layerIndex)->layer_as_StandInLayer(); + auto fbDescriptor = fbLayer->descriptor(); + + armnn::StandInDescriptor descriptor; + descriptor.m_NumInputs = fbDescriptor->numInputs(); + descriptor.m_NumOutputs = fbDescriptor->numOutputs(); + + CHECK_VALID_SIZE(inputs.size(), descriptor.m_NumInputs); + CHECK_VALID_SIZE(outputs.size(), descriptor.m_NumOutputs); + + const std::string layerName = GetLayerName(graph, layerIndex); + armnn::IConnectableLayer* layer = m_Network->AddStandInLayer(descriptor, layerName.c_str()); + + for (unsigned int i = 0u; i < descriptor.m_NumOutputs; ++i) + { + armnn::TensorInfo outputInfo = ToTensorInfo(outputs[i]); + layer->GetOutputSlot(i).SetTensorInfo(outputInfo); + } + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); +} + } // namespace armnnDeserializer diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index b951483926..babb56e70e 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -123,6 +123,7 @@ private: void ParseSpaceToDepth(GraphPtr graph, unsigned int layerIndex); void ParseSplitter(GraphPtr graph, unsigned int layerIndex); void ParseStack(GraphPtr graph, unsigned int layerIndex); + void ParseStandIn(GraphPtr graph, unsigned int layerIndex); void ParseStridedSlice(GraphPtr graph, unsigned int layerIndex); void ParseSubtraction(GraphPtr graph, unsigned int layerIndex); void ParseSwitch(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index fce7064337..fcadaccb79 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -50,6 +50,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * SpaceToDepth * Splitter * Stack +* StandIn * StridedSlice * Subtraction * Switch |