aboutsummaryrefslogtreecommitdiff
path: root/src/armnnDeserializer/Deserializer.cpp
diff options
context:
space:
mode:
authorNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-09-09 17:16:24 +0100
committerNarumol Prangnawarat <narumol.prangnawarat@arm.com>2019-09-11 08:57:05 +0000
commit0cfcf235c4bcd2ae570eea8bc2677f471281b8e6 (patch)
treedbeba0ddeb240f91099f6d436757cd365dc8ab2b /src/armnnDeserializer/Deserializer.cpp
parent4cd29a046c3d46917d84d12feb668969af23a39e (diff)
downloadarmnn-0cfcf235c4bcd2ae570eea8bc2677f471281b8e6.tar.gz
IVGCVSW-3724 Adding serialization support for ArgMinMax
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com> Change-Id: I21210c843c3b8800ccc68d4f3095259d0a233bd1
Diffstat (limited to 'src/armnnDeserializer/Deserializer.cpp')
-rw-r--r--src/armnnDeserializer/Deserializer.cpp41
1 files changed, 41 insertions, 0 deletions
diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 8572023fc4..f8ec2e79cf 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -188,6 +188,7 @@ m_ParserFunctions(Layer_MAX+1, &Deserializer::ParseUnsupportedLayer)
m_ParserFunctions[Layer_AbsLayer] = &Deserializer::ParseAbs;
m_ParserFunctions[Layer_ActivationLayer] = &Deserializer::ParseActivation;
m_ParserFunctions[Layer_AdditionLayer] = &Deserializer::ParseAdd;
+ m_ParserFunctions[Layer_ArgMinMaxLayer] = &Deserializer::ParseArgMinMax;
m_ParserFunctions[Layer_BatchToSpaceNdLayer] = &Deserializer::ParseBatchToSpaceNd;
m_ParserFunctions[Layer_BatchNormalizationLayer] = &Deserializer::ParseBatchNormalization;
m_ParserFunctions[Layer_ConcatLayer] = &Deserializer::ParseConcat;
@@ -244,6 +245,8 @@ Deserializer::LayerBaseRawPtr Deserializer::GetBaseLayer(const GraphPtr& graphPt
return graphPtr->layers()->Get(layerIndex)->layer_as_ActivationLayer()->base();
case Layer::Layer_AdditionLayer:
return graphPtr->layers()->Get(layerIndex)->layer_as_AdditionLayer()->base();
+ case Layer::Layer_ArgMinMaxLayer:
+ return graphPtr->layers()->Get(layerIndex)->layer_as_ArgMinMaxLayer()->base();
case Layer::Layer_BatchToSpaceNdLayer:
return graphPtr->layers()->Get(layerIndex)->layer_as_BatchToSpaceNdLayer()->base();
case Layer::Layer_BatchNormalizationLayer:
@@ -401,6 +404,18 @@ armnn::ActivationFunction ToActivationFunction(armnnSerializer::ActivationFuncti
}
}
+armnn::ArgMinMaxFunction ToArgMinMaxFunction(armnnSerializer::ArgMinMaxFunction function)
+{
+ switch (function)
+ {
+ case armnnSerializer::ArgMinMaxFunction::ArgMinMaxFunction_Max:
+ return armnn::ArgMinMaxFunction::Max;
+ case armnnSerializer::ArgMinMaxFunction::ArgMinMaxFunction_Min:
+ default:
+ return armnn::ArgMinMaxFunction::Min;
+ }
+}
+
armnn::ResizeMethod ToResizeMethod(armnnSerializer::ResizeMethod method)
{
switch (method)
@@ -922,6 +937,32 @@ void Deserializer::ParseAdd(GraphPtr graph, unsigned int layerIndex)
RegisterOutputSlots(graph, layerIndex, layer);
}
+void Deserializer::ParseArgMinMax(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 serializerLayer = graph->layers()->Get(layerIndex)->layer_as_ArgMinMaxLayer();
+ auto serializerDescriptor = serializerLayer->descriptor();
+
+ armnn::ArgMinMaxDescriptor descriptor;
+ descriptor.m_Function = ToArgMinMaxFunction(serializerDescriptor->function());
+ descriptor.m_Axis = serializerDescriptor->axis();
+ auto layerName = GetLayerName(graph, layerIndex);
+ IConnectableLayer* layer = m_Network->AddArgMinMaxLayer(descriptor, layerName.c_str());
+
+ armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]);
+ layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+ RegisterInputSlots(graph, layerIndex, layer);
+ RegisterOutputSlots(graph, layerIndex, layer);
+}
+
void Deserializer::ParseBatchToSpaceNd(GraphPtr graph, unsigned int layerIndex)
{
CHECK_LAYERS(graph, 0, layerIndex);