diff options
| author | Francis Murtagh <francis.murtagh@arm.com> | 2019-11-19 12:06:47 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2019-11-19 12:06:55 +0000 |
| commit | 19fa0cc4fd4915451c3f56f6f4bdb51d8a5ac172 (patch) | |
| tree | 62383c52829cac3f53d6aeab69715061062abb6e /1.2 | |
| parent | 0e2e31b9695f58181e15e770fcfe3d92aa09bf47 (diff) | |
| download | android-nn-driver-19fa0cc4fd4915451c3f56f6f4bdb51d8a5ac172.tar.gz | |
IVGCVSW-3697 Add Support for ANEURALNETWORKS_ARG[MAX|MIN] to HAL 1.2 Driver
!armnn:2313
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I543136e4e2ef9aece1378d2642064cc585246645
Diffstat (limited to '1.2')
| -rw-r--r-- | 1.2/HalPolicy.cpp | 13 | ||||
| -rw-r--r-- | 1.2/HalPolicy.hpp | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index c8e29688..e6f8acbb 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -88,6 +88,10 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, return ConvertAbs(operation, model, data); case V1_2::OperationType::ADD: return ConvertAdd(operation, model, data); + case V1_2::OperationType::ARGMAX: + return ConvertArgMinMax(operation, model, data, ArgMinMaxFunction::Max); + case V1_2::OperationType::ARGMIN: + return ConvertArgMinMax(operation, model, data, ArgMinMaxFunction::Min); case V1_2::OperationType::AVERAGE_POOL_2D: return ConvertAveragePool2d(operation, model, data); case V1_2::OperationType::BATCH_TO_SPACE_ND: @@ -210,6 +214,15 @@ bool HalPolicy::ConvertAdd(const Operation& operation, const Model& model, Conve return ::ConvertAdd<hal_1_2::HalPolicy>(operation, model, data); } +bool HalPolicy::ConvertArgMinMax(const V1_2::Operation& operation, + const V1_2::Model& model, + ConversionData& data, + armnn::ArgMinMaxFunction argMinMaxFunction) +{ + ALOGV("hal_1_2::HalPolicy::ConvertArgMinMax()"); + return ::ConvertArgMinMax<hal_1_2::HalPolicy>(operation, model, data, argMinMaxFunction); +} + bool HalPolicy::ConvertAveragePool2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_2::HalPolicy::ConvertAveragePool2d()"); diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp index d611102b..1f0b54d7 100644 --- a/1.2/HalPolicy.hpp +++ b/1.2/HalPolicy.hpp @@ -35,6 +35,11 @@ private: static bool ConvertAdd(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertArgMinMax(const Operation& operation, + const Model& model, + ConversionData& data, + armnn::ArgMinMaxFunction argMinMaxFunction); + static bool ConvertAveragePool2d(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertBatchToSpaceNd(const Operation& operation, const Model& model, ConversionData& data); |