diff options
| author | Finn Williams <Finn.Williams@arm.com> | 2019-07-30 11:44:05 +0100 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-07-30 13:47:32 +0000 |
| commit | 23b87b33b28fc862ac99c8ae2cfc33b923b6490e (patch) | |
| tree | 0bc9b63c79965d0e917191637103087740630666 /1.2 | |
| parent | a4a629ad3a29df52fb47592d435d41180367ec5f (diff) | |
| download | android-nn-driver-23b87b33b28fc862ac99c8ae2cfc33b923b6490e.tar.gz | |
IVGCVSW-3583 Fix Skipped Batch_To_Space Hal 1.2 Tests
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I3f2928ba86a9d306a7eb400db3a420e42cf3fa7e
Diffstat (limited to '1.2')
| -rw-r--r-- | 1.2/HalPolicy.cpp | 9 | ||||
| -rw-r--r-- | 1.2/HalPolicy.hpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index fe571df2..4372c166 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -55,7 +55,6 @@ bool HandledByV1_1(V1_2::OperationType operationType) } switch (static_cast<V1_1::OperationType>(operationType)) { - case V1_1::OperationType::BATCH_TO_SPACE_ND: case V1_1::OperationType::DIV: case V1_1::OperationType::MEAN: case V1_1::OperationType::SPACE_TO_BATCH_ND: @@ -128,6 +127,8 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, { case V1_2::OperationType::AVERAGE_POOL_2D: return ConvertAveragePool2d(operation, model, data); + case V1_2::OperationType::BATCH_TO_SPACE_ND: + return ConvertBatchToSpaceNd(operation, model, data); case V1_2::OperationType::CONV_2D: return ConvertConv2d(operation, model, data); case V1_2::OperationType::DEPTHWISE_CONV_2D: @@ -182,6 +183,12 @@ bool HalPolicy::ConvertAveragePool2d(const Operation& operation, const Model& mo return ConvertPooling2d<hal_1_2::HalPolicy>(operation, __func__, armnn::PoolingAlgorithm::Average, model, data); } +bool HalPolicy::ConvertBatchToSpaceNd(const Operation& operation, const Model& model, ConversionData& data) +{ + ALOGV("hal_1_2::HalPolicy::ConvertBatchToSpaceNd()"); + return ::ConvertBatchToSpaceNd<hal_1_2::HalPolicy>(operation, model, data); +} + bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_2::HalPolicy::ConvertConv2d()"); diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp index 5d6158a3..e4719e8b 100644 --- a/1.2/HalPolicy.hpp +++ b/1.2/HalPolicy.hpp @@ -33,6 +33,8 @@ public: private: static bool ConvertAveragePool2d(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertBatchToSpaceNd(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data); |