aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kelly <mike.kelly@arm.com>2019-08-15 10:46:46 +0100
committermike.kelly <mike.kelly@arm.com>2019-08-15 09:54:18 +0000
commit999e209da5f4bc3307f9c07021cdb2655add0aea (patch)
tree4f03e26648e8286b9bd562c7dac9448a087cb68e
parent462728090eac533e3122080a86129541df128fe3 (diff)
downloadandroid-nn-driver-999e209da5f4bc3307f9c07021cdb2655add0aea.tar.gz
IVGCVSW-3643 Fix Ref Normalization failures
* Added check for unsupported optional parameters for L2Normalization and LocalResponseNormalization to skip the related tests rather than fail them. Signed-off-by: Mike Kelly <mike.kelly@arm.com> Change-Id: Ia17be706b14b2e2faf8eb5a0ec335c2e3863bf16
-rw-r--r--ConversionUtils.hpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index cfbef5a8..41b3c1cc 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -2257,6 +2257,11 @@ template<typename HalPolicy,
typename Model = typename HalPolicy::Model>
bool ConvertL2Normalization(const Operation& operation, const Model& model, ConversionData& data)
{
+ if (operation.inputs.size() != 1)
+ {
+ return Fail("%s: Optional inputs are not supported", __func__);
+ }
+
using Operand = typename HalPolicy::Operand;
LayerInputHandle input = ConvertToLayerInputHandle<HalPolicy>(operation, 0, model, data);
@@ -2313,6 +2318,11 @@ bool ConvertLocalResponseNormalization(const Operation& operation,
const Model& model,
ConversionData& data)
{
+ if (operation.inputs.size() != 5)
+ {
+ return Fail("%s: Optional inputs are not supported", __func__);
+ }
+
using Operand = typename HalPolicy::Operand;
using OperandType = typename HalPolicy::OperandType;