diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/validation/CL/GaussianPyramid.cpp | 111 | ||||
-rw-r--r-- | tests/validation/NEON/GaussianPyramid.cpp | 12 | ||||
-rw-r--r-- | tests/validation/reference/GaussianPyramidHalf.cpp | 2 |
3 files changed, 117 insertions, 8 deletions
diff --git a/tests/validation/CL/GaussianPyramid.cpp b/tests/validation/CL/GaussianPyramid.cpp new file mode 100644 index 0000000000..2a4596d366 --- /dev/null +++ b/tests/validation/CL/GaussianPyramid.cpp @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. +*/ +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/CLTensorAllocator.h" +#include "arm_compute/runtime/CL/functions/CLGaussianPyramid.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/BorderModeDataset.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/GaussianPyramidHalfFixture.h" +#include "tests/validation/reference/Utils.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +const auto small_gaussian_pyramid_levels = combine(datasets::Medium2DShapes(), datasets::BorderModes()) * framework::dataset::make("numlevels", 2, 4); +const auto large_gaussian_pyramid_levels = combine(datasets::Large2DShapes(), datasets::BorderModes()) * framework::dataset::make("numlevels", 2, 5); + +template <typename T> +inline void validate_gaussian_pyramid(const CLPyramid &target, const std::vector<SimpleTensor<T>> &reference, BorderMode border_mode) +{ + ValidRegion prev_valid_region = shape_to_valid_region(reference[0].shape()); + + for(size_t i = 1; i < reference.size(); ++i) + { + const ValidRegion valid_region = shape_to_valid_region_gaussian_pyramid_half(reference[i - 1].shape(), prev_valid_region, (border_mode == BorderMode::UNDEFINED)); + + // Validate outputs + validate(CLAccessor(*(target.get_pyramid_level(i))), reference[i], valid_region); + + // Keep the valid region for the next level + prev_valid_region = valid_region; + } +} + +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(GaussianPyramid) +TEST_SUITE(Half) + +DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, large_gaussian_pyramid_levels, + shape, border_mode, num_levels) +{ + CLTensor src = create_tensor<CLTensor>(shape, DataType::U8); + + // Create pyramid + PyramidInfo pyramid_info(num_levels, SCALE_PYRAMID_HALF, shape, Format::U8); + CLPyramid dst; + dst.init(pyramid_info); + + CLGaussianPyramidHalf gaussian_pyramid_half; + gaussian_pyramid_half.configure(&src, &dst, border_mode, 0); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + + for(size_t level = 0; level < pyramid_info.num_levels(); ++level) + { + ARM_COMPUTE_EXPECT(dst.get_pyramid_level(level)->info()->is_resizable(), framework::LogLevel::ERRORS); + } +} + +template <typename T> +using CLGaussianPyramidHalfFixture = GaussianPyramidHalfValidationFixture<CLTensor, CLAccessor, CLGaussianPyramidHalf, T, CLPyramid>; + +FIXTURE_DATA_TEST_CASE(RunSmallGaussianPyramidHalf, CLGaussianPyramidHalfFixture<uint8_t>, framework::DatasetMode::ALL, small_gaussian_pyramid_levels) +{ + validate_gaussian_pyramid(_target, _reference, _border_mode); +} + +FIXTURE_DATA_TEST_CASE(RunLargeGaussianPyramidHalf, CLGaussianPyramidHalfFixture<uint8_t>, framework::DatasetMode::NIGHTLY, large_gaussian_pyramid_levels) +{ + validate_gaussian_pyramid(_target, _reference, _border_mode); +} +TEST_SUITE_END() +TEST_SUITE_END() +TEST_SUITE_END() +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/NEON/GaussianPyramid.cpp b/tests/validation/NEON/GaussianPyramid.cpp index 0dea57e75b..c646b5011f 100644 --- a/tests/validation/NEON/GaussianPyramid.cpp +++ b/tests/validation/NEON/GaussianPyramid.cpp @@ -44,13 +44,11 @@ namespace validation { namespace { -constexpr AbsoluteTolerance<float> tolerance_fp32(1.0f); /**< Tolerance value for comparing reference's output against implementation's output */ - const auto small_gaussian_pyramid_levels = combine(datasets::Medium2DShapes(), datasets::BorderModes()) * framework::dataset::make("numlevels", 2, 4); const auto large_gaussian_pyramid_levels = combine(datasets::Large2DShapes(), datasets::BorderModes()) * framework::dataset::make("numlevels", 2, 5); -template <typename T, typename U> -inline void validate_gaussian_pyramid(const Pyramid &target, const std::vector<SimpleTensor<T>> &reference, BorderMode border_mode, U tolerance, float tolerance_number = 0.0f) +template <typename T> +inline void validate_gaussian_pyramid(const Pyramid &target, const std::vector<SimpleTensor<T>> &reference, BorderMode border_mode) { ValidRegion prev_valid_region = shape_to_valid_region(reference[0].shape()); @@ -59,7 +57,7 @@ inline void validate_gaussian_pyramid(const Pyramid &target, const std::vector<S const ValidRegion valid_region = shape_to_valid_region_gaussian_pyramid_half(reference[i - 1].shape(), prev_valid_region, (border_mode == BorderMode::UNDEFINED)); // Validate outputs - validate(Accessor(*(target.get_pyramid_level(i))), reference[i], valid_region, tolerance, tolerance_number); + validate(Accessor(*(target.get_pyramid_level(i))), reference[i], valid_region); // Keep the valid region for the next level prev_valid_region = valid_region; @@ -97,12 +95,12 @@ using NEGaussianPyramidHalfFixture = GaussianPyramidHalfValidationFixture<Tensor FIXTURE_DATA_TEST_CASE(RunSmallGaussianPyramidHalf, NEGaussianPyramidHalfFixture<uint8_t>, framework::DatasetMode::ALL, small_gaussian_pyramid_levels) { - validate_gaussian_pyramid(_target, _reference, _border_mode, tolerance_fp32); + validate_gaussian_pyramid(_target, _reference, _border_mode); } FIXTURE_DATA_TEST_CASE(RunLargeGaussianPyramidHalf, NEGaussianPyramidHalfFixture<uint8_t>, framework::DatasetMode::NIGHTLY, large_gaussian_pyramid_levels) { - validate_gaussian_pyramid(_target, _reference, _border_mode, tolerance_fp32); + validate_gaussian_pyramid(_target, _reference, _border_mode); } TEST_SUITE_END() TEST_SUITE_END() diff --git a/tests/validation/reference/GaussianPyramidHalf.cpp b/tests/validation/reference/GaussianPyramidHalf.cpp index 0a68dedaee..7d5eb07512 100644 --- a/tests/validation/reference/GaussianPyramidHalf.cpp +++ b/tests/validation/reference/GaussianPyramidHalf.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * |