From 925ca0f7402115da3bffb21c04fca0bc822c9b38 Mon Sep 17 00:00:00 2001 From: Abe Mbise Date: Mon, 2 Oct 2017 19:16:33 +0100 Subject: COMPMID-491 Port Utils UNIT tests to new validation Change-Id: Ia99d26768d780d6d0fee9f5e2ed88f3276ecf3d0 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/89908 Reviewed-by: Anthony Barbier Tested-by: Kaizen Reviewed-by: Georgios Pinitas Reviewed-by: Pablo Tello --- tests/SConscript | 4 ++ tests/validation/UNIT/Utils.cpp | 92 ++++++++++++++++++++++++++++++++++++ tests/validation_old/UNIT/Utils.cpp | 94 ------------------------------------- 3 files changed, 96 insertions(+), 94 deletions(-) create mode 100644 tests/validation/UNIT/Utils.cpp delete mode 100644 tests/validation_old/UNIT/Utils.cpp (limited to 'tests') diff --git a/tests/SConscript b/tests/SConscript index ccda55b649..9e6da9367d 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -84,6 +84,10 @@ files_validation = Glob('validation/*.cpp') # Always compile reference for validation files_validation += Glob('validation/CPP/*.cpp') +# Add unit tests +files_validation += Glob('validation/UNIT/*/*.cpp') +files_validation += Glob('validation/UNIT/*.cpp') + if env['opencl']: Import('opencl') diff --git a/tests/validation/UNIT/Utils.cpp b/tests/validation/UNIT/Utils.cpp new file mode 100644 index 0000000000..96f9997d5b --- /dev/null +++ b/tests/validation/UNIT/Utils.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2017 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 "tests/Utils.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "utils/TypePrinter.h" + +#include + +using namespace arm_compute; +using namespace arm_compute::test; +using namespace arm_compute::test::validation; + +TEST_SUITE(UNIT) +TEST_SUITE(Utils) + +DATA_TEST_CASE(RoundHalfUp, framework::DatasetMode::ALL, zip(framework::dataset::make("FloatIn", { 1.f, 1.2f, 1.5f, 2.5f, 2.9f, -3.f, -3.5f, -3.8f, -4.3f, -4.5f }), + framework::dataset::make("FloatOut", { 1.f, 1.f, 2.f, 3.f, 3.f, -3.f, -3.f, -4.f, -4.f, -4.f })), + value, result) +{ + ARM_COMPUTE_EXPECT(round_half_up(value) == result, framework::LogLevel::ERRORS); +} + +DATA_TEST_CASE(RoundHalfEven, framework::DatasetMode::ALL, zip(framework::dataset::make("FloatIn", { 1.f, 1.2f, 1.5f, 2.5f, 2.9f, -3.f, -3.5f, -3.8f, -4.3f, -4.5f }), + framework::dataset::make("FloatOut", { 1.f, 1.f, 2.f, 2.f, 3.f, -3.f, -4.f, -4.f, -4.f, -4.f })), + value, result) +{ + ARM_COMPUTE_EXPECT(round_half_even(value) == result, framework::LogLevel::ERRORS); +} + +DATA_TEST_CASE(Index2Coord, framework::DatasetMode::ALL, zip(zip(framework::dataset::make("Shape", { TensorShape{ 1U }, TensorShape{ 2U }, TensorShape{ 2U, 3U } }), framework::dataset::make("Index", { 0, 1, 2 })), + framework::dataset::make("Coordinates", { Coordinates{ 0 }, Coordinates{ 1 }, Coordinates{ 0, 1 } })), + shape, index, ref_coordinate) +{ + Coordinates coordinate = index2coord(shape, index); + + ARM_COMPUTE_EXPECT(compare_dimensions(coordinate, ref_coordinate), framework::LogLevel::ERRORS); +} + +//FIXME: Negative tests only work in debug mode +#if 0 +DISABLED_DATA_TEST_CASE(Index2CoordFail, framework::DatasetMode::ALL, zip(framework::dataset::make("Shape", { TensorShape{}, TensorShape{ 2U }, TensorShape{ 2U } }), framework::dataset::make("Index", { 0, -1, 2 })), + shape, index) +{ + ARM_COMPUTE_ASSERT(index2coord(shape, index)); +} +#endif /* 0 */ + +DATA_TEST_CASE(Coord2Index, framework::DatasetMode::ALL, zip(zip(framework::dataset::make("Shape", { TensorShape{ 1U }, TensorShape{ 2U }, TensorShape{ 2U, 3U } }), + framework::dataset::make("Coordinates", { Coordinates{ 0 }, Coordinates{ 1 }, Coordinates{ 0, 1 } })), + framework::dataset::make("Index", { 0, 1, 2 })), + shape, coordinate, ref_index) +{ + int index = coord2index(shape, coordinate); + + ARM_COMPUTE_EXPECT(index == ref_index, framework::LogLevel::ERRORS); +} + +//FIXME: Negative tests only work in debug mode +#if 0 +DISABLED_DATA_TEST_CASE(Coord2IndexFail, framework::DatasetMode::ALL, zip(framework::dataset::make("Shape", { TensorShape{}, TensorShape{ 2U } }), framework::dataset::make("Coordinates", { Coordinates{ 0 }, Coordinates{} })), + shape, coordinate) +{ + ARM_COMPUTE_ASSERT(coord2index(shape, coordinate)); +} +#endif /* 0 */ + +TEST_SUITE_END() +TEST_SUITE_END() diff --git a/tests/validation_old/UNIT/Utils.cpp b/tests/validation_old/UNIT/Utils.cpp deleted file mode 100644 index a32fe189ee..0000000000 --- a/tests/validation_old/UNIT/Utils.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2017 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 "Utils.h" - -#include "tests/validation_old/Validation.h" -#include "utils/TypePrinter.h" - -#include "tests/validation_old/boost_wrapper.h" - -#include - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(UNIT) -BOOST_AUTO_TEST_SUITE(Utils) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(RoundHalfUp, boost::unit_test::data::make({ 1.f, 1.2f, 1.5f, 2.5f, 2.9f, -3.f, -3.5f, -3.8f, -4.3f, -4.5f }) ^ boost::unit_test::data::make({ 1.f, 1.f, 2.f, 3.f, 3.f, -3.f, -3.f, -4.f, -4.f, -4.f }), - value, result) -{ - BOOST_TEST(round_half_up(value) == result); -} - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(RoundHalfEven, boost::unit_test::data::make({ 1.f, 1.2f, 1.5f, 2.5f, 2.9f, -3.f, -3.5f, -3.8f, -4.3f, -4.5f }) ^ boost::unit_test::data::make({ 1.f, 1.f, 2.f, 2.f, 3.f, -3.f, -4.f, -4.f, -4.f, -4.f }), - value, result) -{ - BOOST_TEST(round_half_even(value) == result); -} - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(Index2Coord, boost::unit_test::data::make({ TensorShape{ 1U }, TensorShape{ 2U }, TensorShape{ 2U, 3U } }) ^ boost::unit_test::data::make({ 0, 1, 2 }) ^ - boost::unit_test::data::make({ Coordinates{ 0 }, Coordinates{ 1 }, Coordinates{ 0, 1 } }), shape, index, ref_coordinate) -{ - Coordinates coordinate = index2coord(shape, index); - - BOOST_TEST(compare_dimensions(coordinate, ref_coordinate)); -} - -//FIXME: Negative tests only work in debug mode -#if 0 -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(Index2CoordFail, boost::unit_test::data::make({ TensorShape{}, TensorShape{ 2U }, TensorShape{ 2U } }) ^ boost::unit_test::data::make({ 0, -1, 2 }), shape, index) -{ - BOOST_CHECK_THROW(index2coord(shape, index), std::runtime_error); -} -#endif /* 0 */ - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(Coord2Index, boost::unit_test::data::make({ TensorShape{ 1U }, TensorShape{ 2U }, TensorShape{ 2U, 3U } }) ^ boost::unit_test::data::make({ Coordinates{ 0 }, Coordinates{ 1 }, Coordinates{ 0, 1 } }) - ^ boost::unit_test::data::make({ 0, 1, 2 }), - shape, coordinate, ref_index) -{ - int index = coord2index(shape, coordinate); - - BOOST_TEST(index == ref_index); -} - -//FIXME: Negative tests only work in debug mode -#if 0 -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(Coord2IndexFail, boost::unit_test::data::make({ TensorShape{}, TensorShape{ 2U } }) ^ boost::unit_test::data::make({ Coordinates{ 0 }, Coordinates{} }), shape, coordinate) -{ - BOOST_CHECK_THROW(coord2index(shape, coordinate), std::runtime_error); -} -#endif /* 0 */ - -BOOST_AUTO_TEST_SUITE_END() -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ -- cgit v1.2.1