From 25ef7217ec4e13682bf37c87c0c6075a799ba1c0 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 2 Jun 2020 23:00:41 +0100 Subject: COMPMID-3180: Remove padding from NEThreshold - Removes padding from NEThresholdKernel - Alters configuration interface to use a descriptor Change-Id: I394d5e1375454813856d9d206e61dc9a87c2cadc Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3300 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/CL/Threshold.cpp | 4 ++-- tests/validation/NEON/Threshold.cpp | 9 ++++----- tests/validation/fixtures/ThresholdFixture.h | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/validation/CL/Threshold.cpp b/tests/validation/CL/Threshold.cpp index 9c68ffe34c..ec4baf4265 100644 --- a/tests/validation/CL/Threshold.cpp +++ b/tests/validation/CL/Threshold.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -52,7 +52,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(datas // Create and configure function CLThreshold thrsh; - thrsh.configure(&src, &dst, threshold, false_value, true_value, type, upper); + thrsh.configure(&src, &dst, ThresholdKernelInfo(threshold, false_value, true_value, type, upper)); // Validate valid region const ValidRegion valid_region = shape_to_valid_region(shape); diff --git a/tests/validation/NEON/Threshold.cpp b/tests/validation/NEON/Threshold.cpp index 7cddf7ccb7..fd6d936050 100644 --- a/tests/validation/NEON/Threshold.cpp +++ b/tests/validation/NEON/Threshold.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -53,16 +53,15 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(datas // Create and configure function NEThreshold thrsh; - thrsh.configure(&src, &dst, threshold, false_value, true_value, type, upper); + thrsh.configure(&src, &dst, ThresholdKernelInfo(threshold, false_value, true_value, type, upper)); // Validate valid region const ValidRegion valid_region = shape_to_valid_region(shape); validate(dst.info()->valid_region(), valid_region); // Validate padding - const PaddingSize padding = PaddingCalculator(shape.x(), 16).required_padding(); - validate(src.info()->padding(), padding); - validate(dst.info()->padding(), padding); + validate(src.info()->padding(), PaddingSize()); + validate(dst.info()->padding(), PaddingSize()); } template diff --git a/tests/validation/fixtures/ThresholdFixture.h b/tests/validation/fixtures/ThresholdFixture.h index 9a92175728..1aef6fa4ee 100644 --- a/tests/validation/fixtures/ThresholdFixture.h +++ b/tests/validation/fixtures/ThresholdFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -65,7 +65,7 @@ protected: // Create and configure function FunctionType thrsh; - thrsh.configure(&src, &dst, threshold, false_value, true_value, type, upper); + thrsh.configure(&src, &dst, ThresholdKernelInfo(threshold, false_value, true_value, type, upper)); ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); -- cgit v1.2.1