diff options
| author | Saoirse Stewart <saoirse.stewart@arm.com> | 2019-03-04 13:40:12 +0000 |
|---|---|---|
| committer | Saoirse Stewart <saoirse.stewart@arm.com> | 2019-03-04 13:40:12 +0000 |
| commit | a1ed73a7c0780584a957509ddc4e65ad4de22c39 (patch) | |
| tree | 7a4da5dda5ecea1c7134f63946a557c074bf3384 /src/armnnDeserializer/Deserializer.cpp | |
| parent | b348521a8308d374e39c5d8da1a94622e89cf8df (diff) | |
| download | armnn-experimental/matteo.tar.gz | |
IVGCVSW-2691 Add Serialize/Deseralize Gather layerexperimental/matteo
Change-Id: I589d37c9f65801b701858d6e68e2e3151fac6e16
Signed-off-by: Saoirse Stewart <saoirse.stewart@arm.com>
Diffstat (limited to 'src/armnnDeserializer/Deserializer.cpp')
| -rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index e4c9bd67be..405d95ed18 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_EqualLayer] = &Deserializer::ParseEqual; m_ParserFunctions[Layer_FullyConnectedLayer] = &Deserializer::ParseFullyConnected; m_ParserFunctions[Layer_FloorLayer] = &Deserializer::ParseFloor; + m_ParserFunctions[Layer_GatherLayer] = &Deserializer::ParseGather; m_ParserFunctions[Layer_GreaterLayer] = &Deserializer::ParseGreater; m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; m_ParserFunctions[Layer_MaximumLayer] = &Deserializer::ParseMaximum; @@ -241,6 +242,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt return graphPtr->layers()->Get(layerIndex)->layer_as_FullyConnectedLayer()->base(); case Layer::Layer_FloorLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_FloorLayer()->base(); + case Layer::Layer_GatherLayer: + return graphPtr->layers()->Get(layerIndex)->layer_as_GatherLayer()->base(); case Layer::Layer_GreaterLayer: return graphPtr->layers()->Get(layerIndex)->layer_as_GreaterLayer()->base(); case Layer::Layer_InputLayer: @@ -468,7 +471,7 @@ Deserializer::LayerBaseRawPtrVector Deserializer::GetGraphOutputs(const GraphPtr } Deserializer::TensorRawPtrVector Deserializer::GetInputs(const GraphPtr& graphPtr, - unsigned int layerIndex) + unsigned int layerIndex) { CHECK_LAYERS(graphPtr, 0, layerIndex); auto layer = GetBaseLayer(graphPtr, layerIndex); @@ -611,7 +614,7 @@ INetworkPtr Deserializer::CreateNetworkFromGraph(GraphPtr graph) } BindingPointInfo Deserializer::GetNetworkInputBindingInfo(unsigned int layerIndex, - const std::string& name) const + const std::string& name) const { for (auto inputBinding : m_InputBindings) { @@ -1710,4 +1713,27 @@ void Deserializer::ParseSubtraction(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } +void Deserializer::ParseGather(GraphPtr graph, unsigned int layerIndex) +{ + CHECK_LAYERS(graph, 0, layerIndex); + + Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex); + CHECK_VALID_SIZE(inputs.size(), 2); + + Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex); + CHECK_VALID_SIZE(outputs.size(), 1); + + auto layerName = GetLayerName(graph, layerIndex); + + IConnectableLayer* layer = m_Network->AddGatherLayer(layerName.c_str()); + + armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); + + layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); + + RegisterInputSlots(graph, layerIndex, layer); + RegisterOutputSlots(graph, layerIndex, layer); + +} + } // namespace armnnDeserializer |