diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-05-10 13:55:21 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-05-14 10:35:28 +0000 |
| commit | 906f94631aa7ef590b9d8ff45507e818a0d1ac2c (patch) | |
| tree | bbb9d805b9424f92fe4f6a7030878e101873b03f /src/armnnDeserializer/Deserializer.cpp | |
| parent | 305620201159eb47e005a46d60f80c6a2c763d51 (diff) | |
| download | armnn-906f94631aa7ef590b9d8ff45507e818a0d1ac2c.tar.gz | |
IVGCVSW-3076 Add ConcatLayer methods to public API
!android-nn-driver:1120
Change-Id: I5192fa3deb4ea9766d38ad0bf4dfbfa0b4924c41
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnnDeserializer/Deserializer.cpp')
| -rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp index 8b790f7b04..b7d45e0a7d 100644 --- a/src/armnnDeserializer/Deserializer.cpp +++ b/src/armnnDeserializer/Deserializer.cpp @@ -209,7 +209,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer) m_ParserFunctions[Layer_MeanLayer] = &Deserializer::ParseMean; m_ParserFunctions[Layer_MinimumLayer] = &Deserializer::ParseMinimum; m_ParserFunctions[Layer_MergeLayer] = &Deserializer::ParseMerge; - m_ParserFunctions[Layer_MergerLayer] = &Deserializer::ParseMerger; + m_ParserFunctions[Layer_MergerLayer] = &Deserializer::ParseConcat; m_ParserFunctions[Layer_MultiplicationLayer] = &Deserializer::ParseMultiplication; m_ParserFunctions[Layer_NormalizationLayer] = &Deserializer::ParseNormalization; m_ParserFunctions[Layer_PadLayer] = &Deserializer::ParsePad; @@ -1213,7 +1213,7 @@ void Deserializer::ParseMaximum(GraphPtr graph, unsigned int layerIndex) RegisterOutputSlots(graph, layerIndex, layer); } -void Deserializer::ParseMerger(GraphPtr graph, unsigned int layerIndex) +void Deserializer::ParseConcat(GraphPtr graph, unsigned int layerIndex) { CHECK_LAYERS(graph, 0, layerIndex); CHECK_LOCATION(); @@ -1244,7 +1244,7 @@ void Deserializer::ParseMerger(GraphPtr graph, unsigned int layerIndex) } descriptor.SetConcatAxis(mergerDescriptor->concatAxis()); - IConnectableLayer* layer = m_Network->AddMergerLayer(descriptor, layerName.c_str()); + IConnectableLayer* layer = m_Network->AddConcatLayer(descriptor, layerName.c_str()); armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]); layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo); |