diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2019-07-25 09:09:40 +0100 |
---|---|---|
committer | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-07-25 11:31:48 +0100 |
commit | 6111316eb609bd71589b963cf6fc56b18ba3d241 (patch) | |
tree | 105d8a0aa72d18cfc246b37911d460f747c13220 /1.0 | |
parent | c921f6baf18ca05f14a41097b4e075e2d4fc7479 (diff) | |
download | android-nn-driver-6111316eb609bd71589b963cf6fc56b18ba3d241.tar.gz |
IVGCVSW-3530 Fix DynamicOutput Tests for Android Q NeuralNetworks 1.0 & 1.1
* Fixed for failing Conv2d, DepthwiseConv2d, and Activation tests on Hal 1.0 and 1.1 in Q
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Aron Virginas-Tar <aron.virginas-tar@arm.com>
Change-Id: I435338b90b6c501320083f2fd9372e3a4ac3c32c
Diffstat (limited to '1.0')
-rw-r--r-- | 1.0/HalPolicy.cpp | 29 | ||||
-rw-r--r-- | 1.0/HalPolicy.hpp | 4 |
2 files changed, 6 insertions, 27 deletions
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index b9200f14..7a54e74f 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -1142,34 +1142,19 @@ bool HalPolicy::ConvertMul(const Operation& operation, const Model& model, Conve bool HalPolicy::ConvertReLu(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertReLu()"); - - armnn::ActivationDescriptor desc; - desc.m_Function = armnn::ActivationFunction::ReLu; - - return ConvertToActivation<hal_1_0::HalPolicy>(operation, __func__, desc, model, data); + return ::ConvertReLu<hal_1_0::HalPolicy>(operation, model, data); } bool HalPolicy::ConvertReLu1(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertReLu1()"); - - armnn::ActivationDescriptor desc; - desc.m_Function = armnn::ActivationFunction::BoundedReLu; - desc.m_A = 1.0f; - desc.m_B = -1.0f; - - return ConvertToActivation<hal_1_0::HalPolicy>(operation, __func__, desc, model, data); + return ::ConvertReLu1<hal_1_0::HalPolicy>(operation, model, data); } bool HalPolicy::ConvertReLu6(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertReLu6()"); - - armnn::ActivationDescriptor desc; - desc.m_Function = armnn::ActivationFunction::BoundedReLu; - desc.m_A = 6.0f; - - return ConvertToActivation<hal_1_0::HalPolicy>(operation, __func__, desc, model, data); + return ::ConvertReLu6<hal_1_0::HalPolicy>(operation, model, data); } bool HalPolicy::ConvertSoftmax(const Operation& operation, const Model& model, ConversionData& data) @@ -1285,13 +1270,7 @@ bool HalPolicy::ConvertSpaceToDepth(const Operation& operation, const Model& mod bool HalPolicy::ConvertTanH(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertTanH()"); - - armnn::ActivationDescriptor desc; - desc.m_Function = armnn::ActivationFunction::TanH; - desc.m_A = 1.0f; // android nn does not support tanH parameters - desc.m_B = 1.0f; // set to 1.0f for unity scaling - - return ConvertToActivation<hal_1_0::HalPolicy>(operation, __func__, desc, model, data); + return ::ConvertTanH<hal_1_0::HalPolicy>(operation, model, data); } bool HalPolicy::ConvertReshape(const Operation& operation, const Model& model, ConversionData& data) diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp index 833017b5..4b8dc47a 100644 --- a/1.0/HalPolicy.hpp +++ b/1.0/HalPolicy.hpp @@ -70,14 +70,14 @@ private: static bool ConvertSoftmax(const Operation& operation, const Model& model, ConversionData& data); - static bool ConvertTanH(const Operation& operation, const Model& model, ConversionData& data); - static bool ConvertReshape(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertResizeBilinear(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertTanH(const Operation& operation, const Model& model, ConversionData& data); + static bool ValidateConv2dParameters(const Operation& operation); static bool ValidateDepthwiseConv2dParameters(const Operation& operation); |