diff options
Diffstat (limited to 'tests/validation/NEON')
-rw-r--r-- | tests/validation/NEON/FastCorners.cpp | 15 | ||||
-rw-r--r-- | tests/validation/NEON/HarrisCorners.cpp | 6 |
2 files changed, 9 insertions, 12 deletions
diff --git a/tests/validation/NEON/FastCorners.cpp b/tests/validation/NEON/FastCorners.cpp index 4d42aa5349..4416662fea 100644 --- a/tests/validation/NEON/FastCorners.cpp +++ b/tests/validation/NEON/FastCorners.cpp @@ -28,11 +28,12 @@ #include "tests/NEON/Accessor.h" #include "tests/NEON/ArrayAccessor.h" #include "tests/PaddingCalculator.h" +#include "tests/datasets/ImageFileDatasets.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/FastValidation.h" +#include "tests/validation/Validation.h" #include "tests/validation/fixtures/FastCornersFixture.h" namespace arm_compute @@ -45,10 +46,6 @@ namespace { /* Radius of the Bresenham circle around the candidate point */ const unsigned int bresenham_radius = 3; -/* Allowed percentage of keypoints missing for target */ -const float allowed_missing = 10.f; -/* Allowed percentage of keypoints mismatching between target and reference */ -const float allowed_mismatching = 10.f; /* Tolerance used to compare corner strengths */ const AbsoluteTolerance<float> tolerance(0.5f); } // namespace @@ -94,21 +91,21 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template <typename T> using NEFastCornersFixture = FastCornersValidationFixture<Tensor, Accessor, KeyPointArray, NEFastCorners, T>; -FIXTURE_DATA_TEST_CASE(RunSmall, NEFastCornersFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::Small2DShapes(), framework::dataset::make("Format", Format::U8)), +FIXTURE_DATA_TEST_CASE(RunSmall, NEFastCornersFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallImageFiles(), framework::dataset::make("Format", Format::U8)), framework::dataset::make("SuppressNonMax", { false, true })), framework::dataset::make("BorderMode", BorderMode::UNDEFINED))) { // Validate output ArrayAccessor<KeyPoint> array(_target); - fast_validate_keypoints(array.buffer(), array.buffer() + array.num_values(), _reference.begin(), _reference.end(), tolerance, allowed_missing, allowed_mismatching); + validate_keypoints(array.buffer(), array.buffer() + array.num_values(), _reference.begin(), _reference.end(), tolerance); } -FIXTURE_DATA_TEST_CASE(RunLarge, NEFastCornersFixture<uint8_t>, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::Large2DShapes(), framework::dataset::make("Format", Format::U8)), +FIXTURE_DATA_TEST_CASE(RunLarge, NEFastCornersFixture<uint8_t>, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::LargeImageFiles(), framework::dataset::make("Format", Format::U8)), framework::dataset::make("SuppressNonMax", { false, true })), framework::dataset::make("BorderMode", BorderMode::UNDEFINED))) { // Validate output ArrayAccessor<KeyPoint> array(_target); - fast_validate_keypoints(array.buffer(), array.buffer() + array.num_values(), _reference.begin(), _reference.end(), tolerance, allowed_missing, allowed_mismatching); + validate_keypoints(array.buffer(), array.buffer() + array.num_values(), _reference.begin(), _reference.end(), tolerance); } TEST_SUITE_END() diff --git a/tests/validation/NEON/HarrisCorners.cpp b/tests/validation/NEON/HarrisCorners.cpp index b8d791774f..3474a96f8f 100644 --- a/tests/validation/NEON/HarrisCorners.cpp +++ b/tests/validation/NEON/HarrisCorners.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -46,9 +46,9 @@ namespace validation namespace { /* Allowed percentage of keypoints missing for target */ -float allowed_missing_percentage = 10.f; +const float allowed_missing_percentage = 10.f; /* Allowed percentage of keypoints mismatching between target and reference */ -float allowed_mismatch_percentage = 10.f; +const float allowed_mismatch_percentage = 10.f; const auto use_fp16 = framework::dataset::make("UseFP16", { |