From ff1c360815c268b1f526ba7c16919fd021868a67 Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Fri, 22 Sep 2017 12:41:25 +0100 Subject: COMPMID-417: Increase tolerance for failing tests Change-Id: Iafe3fe5ccfe2314d2cedca039d7b8c6cd581b32e Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88678 Tested-by: Kaizen Reviewed-by: Gian Marco Iodice --- tests/validation/CL/Scale.cpp | 6 ++++-- tests/validation/NEON/FullyConnectedLayer.cpp | 4 ++-- tests/validation/NEON/Scale.cpp | 11 +++++++---- tests/validation/Validation.h | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/validation/CL/Scale.cpp b/tests/validation/CL/Scale.cpp index 1a458b7a08..f43f2aeeb9 100644 --- a/tests/validation/CL/Scale.cpp +++ b/tests/validation/CL/Scale.cpp @@ -59,6 +59,8 @@ constexpr AbsoluteTolerance tolerance_u8(1); constexpr AbsoluteTolerance tolerance_s16(1); RelativeTolerance tolerance_f32(0.05); RelativeTolerance tolerance_f16(half(0.1)); + +constexpr float tolerance_num_f32(0.01f); } // namespace TEST_SUITE(CL) @@ -119,7 +121,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, CLScaleFixture, framework::DatasetMode:: const ValidRegion valid_region = calculate_valid_region_scale(src_info, _reference.shape(), _policy, BorderSize(1), (_border_mode == BorderMode::UNDEFINED)); // Validate output - validate(CLAccessor(_target), _reference, valid_region, tolerance_f32); + validate(CLAccessor(_target), _reference, valid_region, tolerance_f32, tolerance_num_f32); } FIXTURE_DATA_TEST_CASE(RunLarge, CLScaleFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::LargeShapes(), framework::dataset::make("DataType", DataType::F32)), framework::dataset::make("InterpolationPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR, InterpolationPolicy::BILINEAR })), @@ -130,7 +132,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLScaleFixture, framework::DatasetMode:: const ValidRegion valid_region = calculate_valid_region_scale(src_info, _reference.shape(), _policy, BorderSize(1), (_border_mode == BorderMode::UNDEFINED)); // Validate output - validate(CLAccessor(_target), _reference, valid_region, tolerance_f32); + validate(CLAccessor(_target), _reference, valid_region, tolerance_f32, tolerance_num_f32); } TEST_SUITE_END() TEST_SUITE(FP16) diff --git a/tests/validation/NEON/FullyConnectedLayer.cpp b/tests/validation/NEON/FullyConnectedLayer.cpp index 9c354123a3..b5ae48a1a0 100644 --- a/tests/validation/NEON/FullyConnectedLayer.cpp +++ b/tests/validation/NEON/FullyConnectedLayer.cpp @@ -43,9 +43,9 @@ namespace validation namespace { /** Tolerance for float operations */ -constexpr AbsoluteTolerance tolerance_f32(0.001f); +constexpr RelativeTolerance tolerance_f32(0.01f); #ifdef ARM_COMPUTE_ENABLE_FP16 -constexpr AbsoluteTolerance tolerance_f16(0.01f); +constexpr RelativeTolerance tolerance_f16(0.01f); #endif /* ARM_COMPUTE_ENABLE_FP16*/ /** Tolerance for fixed point operations */ constexpr AbsoluteTolerance tolerance_fixed_point(1.f); diff --git a/tests/validation/NEON/Scale.cpp b/tests/validation/NEON/Scale.cpp index dc2f4b918a..aa7dc67833 100644 --- a/tests/validation/NEON/Scale.cpp +++ b/tests/validation/NEON/Scale.cpp @@ -58,6 +58,9 @@ const auto ScaleDataTypes = framework::dataset::make("DataType", constexpr AbsoluteTolerance tolerance_u8(1); constexpr AbsoluteTolerance tolerance_s16(1); RelativeTolerance tolerance_f32(0.01); + +constexpr float tolerance_num_s16 = 0.01f; +constexpr float tolerance_num_f32 = 0.01f; } // namespace TEST_SUITE(NEON) @@ -123,7 +126,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEScaleFixture, framework::DatasetMode:: ValidRegion valid_region = calculate_valid_region_scale(src_info, _reference.shape(), _policy, BorderSize(1), (_border_mode == BorderMode::UNDEFINED)); // Validate output - validate(Accessor(_target), _reference, valid_region, tolerance_f32); + validate(Accessor(_target), _reference, valid_region, tolerance_f32, tolerance_num_f32); } FIXTURE_DATA_TEST_CASE(RunLarge, NEScaleFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::LargeShapes(), framework::dataset::make("DataType", DataType::F32)), @@ -135,7 +138,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEScaleFixture, framework::DatasetMode:: ValidRegion valid_region = calculate_valid_region_scale(src_info, _reference.shape(), _policy, BorderSize(1), (_border_mode == BorderMode::UNDEFINED)); // Validate output - validate(Accessor(_target), _reference, valid_region, tolerance_f32); + validate(Accessor(_target), _reference, valid_region, tolerance_f32, tolerance_num_f32); } TEST_SUITE_END() TEST_SUITE_END() @@ -178,7 +181,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEScaleFixture, framework::DatasetMode ValidRegion valid_region = calculate_valid_region_scale(src_info, _reference.shape(), _policy, BorderSize(1), (_border_mode == BorderMode::UNDEFINED)); // Validate output - validate(Accessor(_target), _reference, valid_region, tolerance_s16); + validate(Accessor(_target), _reference, valid_region, tolerance_s16, tolerance_num_s16); } FIXTURE_DATA_TEST_CASE(RunLarge, NEScaleFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::LargeShapes(), framework::dataset::make("DataType", DataType::S16)), @@ -190,7 +193,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEScaleFixture, framework::DatasetMode ValidRegion valid_region = calculate_valid_region_scale(src_info, _reference.shape(), _policy, BorderSize(1), (_border_mode == BorderMode::UNDEFINED)); // Validate output - validate(Accessor(_target), _reference, valid_region, tolerance_s16); + validate(Accessor(_target), _reference, valid_region, tolerance_s16, tolerance_num_s16); } TEST_SUITE_END() TEST_SUITE_END() diff --git a/tests/validation/Validation.h b/tests/validation/Validation.h index 60461f3579..85238617d8 100644 --- a/tests/validation/Validation.h +++ b/tests/validation/Validation.h @@ -270,7 +270,7 @@ struct compare> : public compare_base> return true; } - const U epsilon = (std::is_same::type>::value || (this->_reference == 0)) ? static_cast(0.01) : static_cast(1e-06); + const U epsilon = (std::is_same::type>::value || (this->_reference == 0)) ? static_cast(0.01) : static_cast(1e-05); if(std::abs(static_cast(this->_reference) - static_cast(this->_target)) <= epsilon) { -- cgit v1.2.1