diff options
Diffstat (limited to 'src/armnnDeserializer')
| -rw-r--r-- | src/armnnDeserializer/Deserializer.cpp | 6 | ||||
| -rw-r--r-- | src/armnnDeserializer/Deserializer.hpp | 2 | ||||
| -rw-r--r-- | src/armnnDeserializer/DeserializerSupport.md | 2 |
3 files changed, 5 insertions, 5 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); diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp index dfa5b06057..c647ac3639 100644 --- a/src/armnnDeserializer/Deserializer.hpp +++ b/src/armnnDeserializer/Deserializer.hpp @@ -82,6 +82,7 @@ private: void ParseAdd(GraphPtr graph, unsigned int layerIndex); void ParseBatchToSpaceNd(GraphPtr graph, unsigned int layerIndex); void ParseBatchNormalization(GraphPtr graph, unsigned int layerIndex); + void ParseConcat(GraphPtr graph, unsigned int layerIndex); void ParseConstant(GraphPtr graph, unsigned int layerIndex); void ParseConvolution2d(GraphPtr graph, unsigned int layerIndex); void ParseDepthwiseConvolution2d(GraphPtr graph, unsigned int layerIndex); @@ -98,7 +99,6 @@ private: void ParseMean(GraphPtr graph, unsigned int layerIndex); void ParseMinimum(GraphPtr graph, unsigned int layerIndex); void ParseMerge(GraphPtr graph, unsigned int layerIndex); - void ParseMerger(GraphPtr graph, unsigned int layerIndex); void ParseMultiplication(GraphPtr graph, unsigned int layerIndex); void ParseNormalization(GraphPtr graph, unsigned int layerIndex); void ParseLstm(GraphPtr graph, unsigned int layerIndex); diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md index 9cdeea2800..5c61971ebc 100644 --- a/src/armnnDeserializer/DeserializerSupport.md +++ b/src/armnnDeserializer/DeserializerSupport.md @@ -10,6 +10,7 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Addition * BatchToSpaceNd * BatchNormalization +* Concat * Constant * Convolution2d * DepthwiseConvolution2d @@ -26,7 +27,6 @@ The Arm NN SDK Deserialize parser currently supports the following layers: * Maximum * Mean * Merge -* Merger * Minimum * Multiplication * Normalization |