diff options
| author | SiCong Li <sicong.li@arm.com> | 2017-06-28 15:27:02 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | 7a0357549a0ffa0ea3ea56fa791a15a35368afe8 (patch) | |
| tree | 8f9c9d87f8199d69068ff769cc2136f7407363eb /tests/validation/CL/NonLinearFilter.cpp | |
| parent | 4e288696a2ca8e1c9d6d37d90d237c1a18d6e364 (diff) | |
| download | ComputeLibrary-7a0357549a0ffa0ea3ea56fa791a15a35368afe8.tar.gz | |
COMPMID-424 Clean up validation tests for 2D spatial filter functions
* Remove shape_to_valid_region_undefined_border
* Remove hardcoded border size
Change-Id: I3c64148d8f7ce7e960f21d88d3af43bb23501683
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79106
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/validation/CL/NonLinearFilter.cpp')
| -rw-r--r-- | tests/validation/CL/NonLinearFilter.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tests/validation/CL/NonLinearFilter.cpp b/tests/validation/CL/NonLinearFilter.cpp index 5288f951bf..4a487d6ed4 100644 --- a/tests/validation/CL/NonLinearFilter.cpp +++ b/tests/validation/CL/NonLinearFilter.cpp @@ -125,11 +125,7 @@ BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) // Validate valid region const ValidRegion src_valid_region = shape_to_valid_region(shape); - ValidRegion dst_valid_region = shape_to_valid_region(shape); - if(border_mode == BorderMode::UNDEFINED) - { - dst_valid_region = shape_to_valid_region_undefined_border(shape, BorderSize(half_mask_size)); - } + const ValidRegion dst_valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(half_mask_size)); validate(src.info()->valid_region(), src_valid_region); validate(dst.info()->valid_region(), dst_valid_region); @@ -171,11 +167,7 @@ BOOST_DATA_TEST_CASE(RunSmall, SmallShapes() RawTensor ref_dst = Reference::compute_reference_non_linear_filter(shape, function, mask_size, pattern, mask, border_mode, constant_border_value); // Calculate valid region - ValidRegion valid_region = shape_to_valid_region(shape); - if(border_mode == BorderMode::UNDEFINED) - { - valid_region = shape_to_valid_region_undefined_border(shape, BorderSize(static_cast<int>(mask_size / 2))); - } + const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(static_cast<int>(mask_size / 2))); // Validate output validate(CLAccessor(dst), ref_dst, valid_region); @@ -202,11 +194,7 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() RawTensor ref_dst = Reference::compute_reference_non_linear_filter(shape, function, mask_size, pattern, mask, border_mode, constant_border_value); // Calculate valid region - ValidRegion valid_region = shape_to_valid_region(shape); - if(border_mode == BorderMode::UNDEFINED) - { - valid_region = shape_to_valid_region_undefined_border(shape, BorderSize(static_cast<int>(mask_size / 2))); - } + const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(static_cast<int>(mask_size / 2))); // Validate output validate(CLAccessor(dst), ref_dst, valid_region); |