diff options
author | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-04-09 14:38:52 +0100 |
---|---|---|
committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-04-09 16:34:18 +0100 |
commit | 28f177c45cb8e23b86c9f3ff435921183340fc33 (patch) | |
tree | f44a2a25e918191cf5f841f03a1a09ab264011bf /src/armnnTfLiteParser/TfLiteParser.hpp | |
parent | 1f140f7226c4ed7bc5cbaf2ce09654eee452f4bf (diff) | |
download | armnn-28f177c45cb8e23b86c9f3ff435921183340fc33.tar.gz |
IVGCVSW-5804 TfLiteParser fails to correctly parse ArgMinMax
* Fix for GitHub#523.
* Updated ParseArgMinMax function to read correct axis data.
* Improved validation in ParseArgMinMax function.
* Added ARG_MIN support to TfLiteParser.
* Added ArgMinMax unit tests for TfLiteParser.
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Ib4ce1a7c66e210c47859a130c4896aac958f2654
Diffstat (limited to 'src/armnnTfLiteParser/TfLiteParser.hpp')
-rw-r--r-- | src/armnnTfLiteParser/TfLiteParser.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/armnnTfLiteParser/TfLiteParser.hpp b/src/armnnTfLiteParser/TfLiteParser.hpp index 07ff4816ea..90517f5aad 100644 --- a/src/armnnTfLiteParser/TfLiteParser.hpp +++ b/src/armnnTfLiteParser/TfLiteParser.hpp @@ -99,6 +99,9 @@ private: void ParseActivation(size_t subgraphIndex, size_t operatorIndex, armnn::ActivationFunction activationType); void ParseAdd(size_t subgraphIndex, size_t operatorIndex); + void ParseArgMinMax(size_t subgraphIndex, size_t operatorIndex, armnn::ArgMinMaxFunction argMinMaxFunction); + void ParseArgMin(size_t subgraphIndex, size_t operatorIndex); + void ParseArgMax(size_t subgraphIndex, size_t operatorIndex); void ParseAveragePool2D(size_t subgraphIndex, size_t operatorIndex); void ParseBatchToSpaceND(size_t subgraphIndex, size_t operatorIndex); void ParseConcatenation(size_t subgraphIndex, size_t operatorIndex); @@ -107,6 +110,7 @@ private: void ParseDepthwiseConv2D(size_t subgraphIndex, size_t operatorIndex); void ParseDequantize(size_t subgraphIndex, size_t operatorIndex); void ParseDetectionPostProcess(size_t subgraphIndex, size_t operatorIndex); + void ParseDiv(size_t subgraphIndex, size_t operatorIndex); void ParseElu(size_t subgraphIndex, size_t operatorIndex); void ParseExp(size_t subgraphIndex, size_t operatorIndex); void ParseFullyConnected(size_t subgraphIndex, size_t operatorIndex); @@ -143,12 +147,10 @@ private: void ParseStridedSlice(size_t subgraphIndex, size_t operatorIndex); void ParseSub(size_t subgraphIndex, size_t operatorIndex); void ParseSum(size_t subgraphIndex, size_t operatorIndex); - void ParseDiv(size_t subgraphIndex, size_t operatorIndex); void ParseTanH(size_t subgraphIndex, size_t operatorIndex); void ParseTranspose(size_t subgraphIndex, size_t operatorIndex); void ParseTransposeConv(size_t subgraphIndex, size_t operatorIndex); void ParseUnpack(size_t subgraphIndex, size_t operatorIndex); - void ParseArgMax(size_t subgraphIndex, size_t operatorIndex); void RegisterProducerOfTensor(size_t subgraphIndex, size_t tensorIndex, armnn::IOutputSlot* slot); void RegisterConsumerOfTensor(size_t subgraphIndex, size_t tensorIndex, armnn::IInputSlot* slot); |