From 09d3451b4caf8d5e0e7cf2c6097e50a1f815d027 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 30 Aug 2018 16:02:11 +0100 Subject: COMPMID-1548: NEON FP16 mismatches on CannyEdge and HarrisCorners. Removes FP16 from HarrisCorners and CannyEdge. Change-Id: I5e4f9205fdbe4de85f04f55ecf1568c837e56cc0 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/146247 Tested-by: Jenkins Reviewed-by: Michele DiGiorgio --- tests/validation/NEON/CannyEdge.cpp | 14 +++----------- tests/validation/NEON/HarrisCorners.cpp | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) (limited to 'tests/validation/NEON') diff --git a/tests/validation/NEON/CannyEdge.cpp b/tests/validation/NEON/CannyEdge.cpp index 5697b622f2..7c4cd8090f 100644 --- a/tests/validation/NEON/CannyEdge.cpp +++ b/tests/validation/NEON/CannyEdge.cpp @@ -48,23 +48,15 @@ namespace /* Allowed ratio of mismatches between target and reference (1.0 = 100%) */ const float allowed_mismatch_ratio = 0.1f; -const auto use_fp16 = framework::dataset::make("UseFP16", -{ -#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC - true, -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ - false -}); - const auto data = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), - combine(framework::dataset::make("Normalization", { MagnitudeType::L1NORM, MagnitudeType::L2NORM }), combine(datasets::BorderModes(), use_fp16))); + combine(framework::dataset::make("Normalization", { MagnitudeType::L1NORM, MagnitudeType::L2NORM }), datasets::BorderModes())); } // namespace TEST_SUITE(NEON) TEST_SUITE(CannyEdge) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(concat(datasets::Small2DShapes(), datasets::Large2DShapes()), data), framework::dataset::make("Format", Format::U8)), - shape, gradient_size, normalization, border_mode, use_fp16, format) + shape, gradient_size, normalization, border_mode, format) { CannyEdgeParameters params = canny_edge_parameters(); // Convert normalisation type to integer @@ -81,7 +73,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(conca // Create Canny edge configure function NECannyEdge canny_edge; - canny_edge.configure(&src, &dst, params.upper_thresh, params.lower_thresh, gradient_size, norm_type, border_mode, params.constant_border_value, use_fp16); + canny_edge.configure(&src, &dst, params.upper_thresh, params.lower_thresh, gradient_size, norm_type, border_mode, params.constant_border_value); // Validate valid region validate(src.info()->valid_region(), shape_to_valid_region(shape, (BorderMode::UNDEFINED == border_mode))); diff --git a/tests/validation/NEON/HarrisCorners.cpp b/tests/validation/NEON/HarrisCorners.cpp index 3474a96f8f..e0bbd92a2e 100644 --- a/tests/validation/NEON/HarrisCorners.cpp +++ b/tests/validation/NEON/HarrisCorners.cpp @@ -50,22 +50,14 @@ const float allowed_missing_percentage = 10.f; /* Allowed percentage of keypoints mismatching between target and reference */ const float allowed_mismatch_percentage = 10.f; -const auto use_fp16 = framework::dataset::make("UseFP16", -{ -#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC - true, -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ - false -}); - -const auto data = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), combine(framework::dataset::make("BlockSize", { 3, 5, 7 }), combine(datasets::BorderModes(), use_fp16))); +const auto data = combine(framework::dataset::make("GradientSize", { 3, 5, 7 }), combine(framework::dataset::make("BlockSize", { 3, 5, 7 }), datasets::BorderModes())); } // namespace TEST_SUITE(NEON) TEST_SUITE(HarrisCorners) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(concat(datasets::Small2DShapes(), datasets::Large2DShapes()), data), framework::dataset::make("Format", Format::U8)), shape, - gradient_size, block_size, border_mode, use_fp16, format) + gradient_size, block_size, border_mode, format) { std::mt19937 gen(library->seed()); std::uniform_real_distribution real_dist(0.f, 0.01f); @@ -90,7 +82,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(conca // Create harris corners configure function NEHarrisCorners harris_corners; - harris_corners.configure(&src, threshold, min_dist, sensitivity, gradient_size, block_size, &corners, border_mode, constant_border_value, use_fp16); + harris_corners.configure(&src, threshold, min_dist, sensitivity, gradient_size, block_size, &corners, border_mode, constant_border_value); // Validate padding PaddingCalculator calculator(shape.x(), 8); -- cgit v1.2.1