From 51b074a0033984d1e4ef225b0025d7bb45567080 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Tue, 20 Feb 2018 12:09:07 +0000 Subject: COMPMID-764 Removed reciprocal QS tests Also fixed issues with some test names Change-Id: I7f35932eb24bedbb645b4b534d7d1bb1342f3696 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/121259 Reviewed-by: Georgios Pinitas Tested-by: Jenkins --- tests/benchmark/CL/SYSTEM/AlexNet.cpp | 2 +- tests/benchmark/CL/SYSTEM/LeNet5.cpp | 4 +-- tests/benchmark/CL/SYSTEM/MobileNet.cpp | 4 +-- tests/benchmark/CL/SYSTEM/MobileNetV1.cpp | 4 +-- tests/benchmark/NEON/SYSTEM/AlexNet.cpp | 2 +- tests/benchmark/NEON/SYSTEM/LeNet5.cpp | 4 +-- tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp | 2 +- tests/validation/NEON/FixedPoint/FixedPoint.cpp | 38 ++++------------------ 8 files changed, 18 insertions(+), 42 deletions(-) diff --git a/tests/benchmark/CL/SYSTEM/AlexNet.cpp b/tests/benchmark/CL/SYSTEM/AlexNet.cpp index 1d38c1a0cd..5401cbdd04 100644 --- a/tests/benchmark/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/CL/SYSTEM/AlexNet.cpp @@ -56,7 +56,7 @@ using CLAlexNetFixture = AlexNetFixture; TEST_SUITE(CL) -TEST_SUITE(SYSTEM_TEST) +TEST_SUITE(SYSTEM_TESTS) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, CLAlexNetFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::make("DataType", { DataType::F16, DataType::F32 }), diff --git a/tests/benchmark/CL/SYSTEM/LeNet5.cpp b/tests/benchmark/CL/SYSTEM/LeNet5.cpp index 21e5432947..09c6f65fc2 100644 --- a/tests/benchmark/CL/SYSTEM/LeNet5.cpp +++ b/tests/benchmark/CL/SYSTEM/LeNet5.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -49,7 +49,7 @@ using CLLeNet5Fixture = LeNet5Fixture; TEST_SUITE(CL) -TEST_SUITE(SYSTEM_TEST) +TEST_SUITE(SYSTEM_TESTS) REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, CLLeNet5Fixture, framework::DatasetMode::ALL, framework::dataset::make("Batches", { 1, 4, 8 })); diff --git a/tests/benchmark/CL/SYSTEM/MobileNet.cpp b/tests/benchmark/CL/SYSTEM/MobileNet.cpp index 4712bc0c80..bc728d9c00 100644 --- a/tests/benchmark/CL/SYSTEM/MobileNet.cpp +++ b/tests/benchmark/CL/SYSTEM/MobileNet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -51,7 +51,7 @@ using CLMobileNetFixture = MobileNetFixture; TEST_SUITE(CL) -TEST_SUITE(SYSTEM_TEST) +TEST_SUITE(SYSTEM_TESTS) REGISTER_FIXTURE_DATA_TEST_CASE(MobileNet, CLMobileNetFixture, framework::DatasetMode::ALL, framework::dataset::make("Batches", { 1, 4, 8 })); diff --git a/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp b/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp index 851148a860..53ab1a7fc3 100644 --- a/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp +++ b/tests/benchmark/CL/SYSTEM/MobileNetV1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -68,7 +68,7 @@ using CLMobileNetV1_128_Fixture = MobileNetV1Fixture; TEST_SUITE(CL) -TEST_SUITE(SYSTEM_TEST) +TEST_SUITE(SYSTEM_TESTS) REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetV1_224, CLMobileNetV1_224_Fixture, framework::DatasetMode::ALL, framework::dataset::make("Batches", { 1, 4, 8 })); diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp index 2da61802c1..e28f967773 100644 --- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp @@ -65,7 +65,7 @@ using NEAlexNetFixture = AlexNetFixture; TEST_SUITE(NEON) -TEST_SUITE(SYSTEM_TEST) +TEST_SUITE(SYSTEM_TESTS) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture, framework::DatasetMode::ALL, framework::dataset::combine(alex_net_data_types, diff --git a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp index 5075da50cf..d8ec5754e7 100644 --- a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp +++ b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -49,7 +49,7 @@ using NELeNet5Fixture = LeNet5Fixture; TEST_SUITE(NEON) -TEST_SUITE(SYSTEM_TEST) +TEST_SUITE(SYSTEM_TESTS) REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5, NELeNet5Fixture, framework::DatasetMode::ALL, framework::dataset::make("Batches", { 1, 4, 8 })); diff --git a/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp b/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp index a5d1b6992f..c66a1001e5 100644 --- a/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp +++ b/tests/validation/GLES_COMPUTE/ConvolutionLayer.cpp @@ -125,10 +125,10 @@ FIXTURE_DATA_TEST_CASE(RunLarge, GCConvolutionLayerFixture, framework::Dat validate(GCAccessor(_target), _reference, tolerance_f16, tolerance_num); } TEST_SUITE_END() +TEST_SUITE_END() TEST_SUITE_END() TEST_SUITE_END() -} } // namespace validation } // namespace test } // namespace arm_compute diff --git a/tests/validation/NEON/FixedPoint/FixedPoint.cpp b/tests/validation/NEON/FixedPoint/FixedPoint.cpp index 871143bc19..a583b587ae 100644 --- a/tests/validation/NEON/FixedPoint/FixedPoint.cpp +++ b/tests/validation/NEON/FixedPoint/FixedPoint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -43,14 +43,12 @@ namespace validation { namespace { -constexpr AbsoluteTolerance tolerance_exp_qs8(0.0f); /**< Tolerance value for comparing reference's output against implementation's output (exponential) for DataType::QS8 */ -constexpr AbsoluteTolerance tolerance_exp_qs16(1.0f); /**< Tolerance value for comparing reference's output against implementation's output (exponential) for DataType::QS16 */ -constexpr AbsoluteTolerance tolerance_invsqrt_qs8(4.0f); /**< Tolerance value for comparing reference's output against implementation's output (inverse square-root) for DataType::QS8 */ -constexpr AbsoluteTolerance tolerance_invsqrt_qs16(5.0f); /**< Tolerance value for comparing reference's output against implementation's output (inverse square-root) for DataType::QS16 */ -constexpr AbsoluteTolerance tolerance_log_qs8(5.0f); /**< Tolerance value for comparing reference's output against implementation's output (logarithm) for DataType::QS8 */ -constexpr AbsoluteTolerance tolerance_log_qs16(7.0f); /**< Tolerance value for comparing reference's output against implementation's output (logarithm) for DataType::QS16 */ -constexpr AbsoluteTolerance tolerance_reciprocal_qs8(3); /**< Tolerance value for comparing reference's output against implementation's output (reciprocal) for DataType::QS8 */ -constexpr AbsoluteTolerance tolerance_reciprocal_qs16(11.0f); /**< Tolerance value for comparing reference's output against implementation's output (reciprocal) for DataType::QS16 */ +constexpr AbsoluteTolerance tolerance_exp_qs8(0.0f); /**< Tolerance value for comparing reference's output against implementation's output (exponential) for DataType::QS8 */ +constexpr AbsoluteTolerance tolerance_exp_qs16(1.0f); /**< Tolerance value for comparing reference's output against implementation's output (exponential) for DataType::QS16 */ +constexpr AbsoluteTolerance tolerance_invsqrt_qs8(4.0f); /**< Tolerance value for comparing reference's output against implementation's output (inverse square-root) for DataType::QS8 */ +constexpr AbsoluteTolerance tolerance_invsqrt_qs16(5.0f); /**< Tolerance value for comparing reference's output against implementation's output (inverse square-root) for DataType::QS16 */ +constexpr AbsoluteTolerance tolerance_log_qs8(5.0f); /**< Tolerance value for comparing reference's output against implementation's output (logarithm) for DataType::QS8 */ +constexpr AbsoluteTolerance tolerance_log_qs16(7.0f); /**< Tolerance value for comparing reference's output against implementation's output (logarithm) for DataType::QS16 */ } // namespace TEST_SUITE(NEON) @@ -92,17 +90,6 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture, framework::Dataset validate(Accessor(_target), _reference, tolerance_log_qs8, 0); } TEST_SUITE_END() - -TEST_SUITE(Reciprocal) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", - DataType::QS8)), - framework::dataset::make("FixedPointOp", FixedPointOp::RECIPROCAL)), - framework::dataset::make("FractionalBits", 1, 6))) -{ - // Validate output - validate(Accessor(_target), _reference, tolerance_reciprocal_qs8, 0); -} -TEST_SUITE_END() TEST_SUITE_END() TEST_SUITE(QS16) @@ -139,17 +126,6 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture, framework::Datase validate(Accessor(_target), _reference, tolerance_log_qs16, 0); } TEST_SUITE_END() - -TEST_SUITE(Reciprocal) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", - DataType::QS16)), - framework::dataset::make("FixedPointOp", FixedPointOp::RECIPROCAL)), - framework::dataset::make("FractionalBits", 1, 14))) -{ - // Validate output - validate(Accessor(_target), _reference, tolerance_reciprocal_qs16, 0); -} -TEST_SUITE_END() TEST_SUITE_END() TEST_SUITE_END() -- cgit v1.2.1