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/NEON/Sobel5x5.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/NEON/Sobel5x5.cpp')
| -rw-r--r-- | tests/validation/NEON/Sobel5x5.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/tests/validation/NEON/Sobel5x5.cpp b/tests/validation/NEON/Sobel5x5.cpp index bb2d7baf79..195afa6922 100644 --- a/tests/validation/NEON/Sobel5x5.cpp +++ b/tests/validation/NEON/Sobel5x5.cpp @@ -52,6 +52,9 @@ using namespace arm_compute::test::validation; namespace { +constexpr unsigned int filter_size = 5; /** Size of the kernel/filter in number of elements. */ +constexpr BorderSize border_size(filter_size / 2); /** Border size of the kernel/filter around its central element. */ + /** Compute Neon Sobel 5x5 function. * * @param[in] shape Shape of the input and output tensors. @@ -120,11 +123,7 @@ BOOST_DATA_TEST_CASE(Configuration, (SmallShapes() + LargeShapes()) * BorderMode // 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(2)); - } + const ValidRegion dst_valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, border_size); validate(src.info()->valid_region(), src_valid_region); validate(dst_x.info()->valid_region(), dst_valid_region); @@ -168,11 +167,7 @@ BOOST_DATA_TEST_CASE(RunSmall, SmallShapes() * BorderModes(), shape, border_mode std::pair<RawTensor, RawTensor> ref_dst = Reference::compute_reference_sobel_5x5(shape, 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(2)); - } + const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, border_size); // Validate output validate(NEAccessor(dst.first), ref_dst.first, valid_region); @@ -199,11 +194,7 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode std::pair<RawTensor, RawTensor> ref_dst = Reference::compute_reference_sobel_5x5(shape, 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(2)); - } + const ValidRegion valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, border_size); // Validate output validate(NEAccessor(dst.first), ref_dst.first, valid_region); |