From 15997879873b374ea297197fc4aafb15e38b938b Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 19 Feb 2018 13:58:22 +0000 Subject: COMPMID-934: Asymmetric padding support. Change-Id: Ibe7a679e4c053a088b8c893e495c97cb24bf7272 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/121298 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- tests/validation/CL/PoolingLayer.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/validation/CL/PoolingLayer.cpp') diff --git a/tests/validation/CL/PoolingLayer.cpp b/tests/validation/CL/PoolingLayer.cpp index dc9604423f..9da4c55c78 100644 --- a/tests/validation/CL/PoolingLayer.cpp +++ b/tests/validation/CL/PoolingLayer.cpp @@ -27,6 +27,7 @@ #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "tests/CL/CLAccessor.h" #include "tests/PaddingCalculator.h" +#include "tests/datasets/PoolingLayerDataset.h" #include "tests/datasets/PoolingTypesDataset.h" #include "tests/datasets/ShapeDatasets.h" #include "tests/framework/Asserts.h" @@ -43,12 +44,6 @@ namespace validation { namespace { -/** Failing data set */ -const auto PoolingLayerDatasetSpecial = ((((framework::dataset::make("Shape", TensorShape{ 60U, 52U, 3U, 5U }) - * framework::dataset::make("PoolType", PoolingType::AVG)) - * framework::dataset::make("PoolingSize", Size2D(100, 100))) - * framework::dataset::make("PadStride", PadStrideInfo(5, 5, 50, 50))) - * framework::dataset::make("ExcludePadding", true)); /** Input data set for floating-point data types */ const auto PoolingLayerDatasetFP = combine(combine(combine(datasets::PoolingTypes(), framework::dataset::make("PoolingSize", { Size2D(2, 2), Size2D(3, 3), Size2D(7, 7), Size2D(9, 9), Size2D(5, 7), Size2D(7, 9) })), framework::dataset::make("PadStride", { PadStrideInfo(1, 1, 0, 0), PadStrideInfo(2, 1, 0, 0), PadStrideInfo(1, 2, 1, 1), PadStrideInfo(2, 2, 1, 0) })), @@ -121,9 +116,12 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( template using CLPoolingLayerFixture = PoolingLayerValidationFixture; +template +using CLSpecialPoolingLayerFixture = SpecialPoolingLayerValidationFixture; + TEST_SUITE(Float) TEST_SUITE(FP32) -FIXTURE_DATA_TEST_CASE(RunSpecial, CLPoolingLayerFixture, framework::DatasetMode::ALL, PoolingLayerDatasetSpecial * framework::dataset::make("DataType", DataType::F32)) +FIXTURE_DATA_TEST_CASE(RunSpecial, CLSpecialPoolingLayerFixture, framework::DatasetMode::ALL, datasets::PoolingLayerDatasetSpecial() * framework::dataset::make("DataType", DataType::F32)) { // Validate output validate(CLAccessor(_target), _reference, tolerance_f32); -- cgit v1.2.1