From b482ce1d601a777250f28ed118ac250943aca4eb Mon Sep 17 00:00:00 2001 From: John Richardson Date: Mon, 18 Sep 2017 12:44:01 +0100 Subject: COMPMID-497: Move FillBorder to new validation Change-Id: Iefa628de780b76977578a250c17f27962664eae0 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88094 Tested-by: Kaizen Reviewed-by: Pablo Tello --- tests/validation/CL/FillBorder.cpp | 103 +++++++++++++++++++++++++++++++ tests/validation/NEON/FillBorder.cpp | 102 ++++++++++++++++++++++++++++++ tests/validation_old/CL/FillBorder.cpp | 89 -------------------------- tests/validation_old/NEON/FillBorder.cpp | 88 -------------------------- utils/TypePrinter.h | 7 +++ 5 files changed, 212 insertions(+), 177 deletions(-) create mode 100644 tests/validation/CL/FillBorder.cpp create mode 100644 tests/validation/NEON/FillBorder.cpp delete mode 100644 tests/validation_old/CL/FillBorder.cpp delete mode 100644 tests/validation_old/NEON/FillBorder.cpp diff --git a/tests/validation/CL/FillBorder.cpp b/tests/validation/CL/FillBorder.cpp new file mode 100644 index 0000000000..a817338c75 --- /dev/null +++ b/tests/validation/CL/FillBorder.cpp @@ -0,0 +1,103 @@ +/* + * 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 "arm_compute/core/CL/kernels/CLFillBorderKernel.h" +#include "arm_compute/runtime/CL/CLScheduler.h" +#include "tests/CL/CLAccessor.h" +#include "tests/Globals.h" +#include "tests/datasets/BorderModeDataset.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(CL) +TEST_SUITE(FillBorder) + +// *INDENT-OFF* +// clang-format off +const auto PaddingSizesDataset = concat(concat( + framework::dataset::make("PaddingSize", PaddingSize{ 0 }), + framework::dataset::make("PaddingSize", PaddingSize{ 1, 0, 1, 2 })), + framework::dataset::make("PaddingSize", PaddingSize{ 10 })); + +const auto BorderSizesDataset = framework::dataset::make("BorderSize", 0, 6); + +DATA_TEST_CASE(FillBorder, framework::DatasetMode::ALL, combine(combine(combine(combine( + datasets::SmallShapes(), + datasets::BorderModes()), + BorderSizesDataset), + PaddingSizesDataset), + framework::dataset::make("DataType", DataType::U8)), + shape, border_mode, size, padding, data_type) +// clang-format on +// *INDENT-ON* +{ + BorderSize border_size{ static_cast(size) }; + + std::mt19937 generator(library->seed()); + std::uniform_int_distribution distribution_u8(0, 255); + const uint8_t border_value = distribution_u8(generator); + const uint8_t tensor_value = distribution_u8(generator); + + // Create tensors + CLTensor src = create_tensor(shape, data_type); + + src.info()->extend_padding(padding); + + // Allocate tensor + src.allocator()->allocate(); + + // Check padding is as required + validate(src.info()->padding(), padding); + + // Fill tensor with constant value + std::uniform_int_distribution distribution{ tensor_value, tensor_value }; + library->fill(CLAccessor(src), distribution, 0); + + // Create and configure kernel + CLFillBorderKernel fill_border; + fill_border.configure(&src, border_size, border_mode, border_value); + + // Run kernel + fill_border.run(fill_border.window(), CLScheduler::get().queue()); + + // Validate border + border_size.limit(padding); + validate(CLAccessor(src), border_size, border_mode, &border_value); + + // Validate tensor + validate(CLAccessor(src), &tensor_value); +} + +TEST_SUITE_END() +TEST_SUITE_END() +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/NEON/FillBorder.cpp b/tests/validation/NEON/FillBorder.cpp new file mode 100644 index 0000000000..7e0fb1a433 --- /dev/null +++ b/tests/validation/NEON/FillBorder.cpp @@ -0,0 +1,102 @@ +/* + * 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 "arm_compute/core/NEON/kernels/NEFillBorderKernel.h" +#include "tests/Globals.h" +#include "tests/NEON/Accessor.h" +#include "tests/datasets/BorderModeDataset.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(NEON) +TEST_SUITE(FillBorder) + +// *INDENT-OFF* +// clang-format off +const auto PaddingSizesDataset = concat(concat( + framework::dataset::make("PaddingSize", PaddingSize{ 0 }), + framework::dataset::make("PaddingSize", PaddingSize{ 1, 0, 1, 2 })), + framework::dataset::make("PaddingSize", PaddingSize{ 10 })); + +const auto BorderSizesDataset = framework::dataset::make("BorderSize", 0, 6); + +DATA_TEST_CASE(FillBorder, framework::DatasetMode::ALL, combine(combine(combine(combine( + datasets::SmallShapes(), + datasets::BorderModes()), + BorderSizesDataset), + PaddingSizesDataset), + framework::dataset::make("DataType", DataType::U8)), + shape, border_mode, size, padding, data_type) +// clang-format on +// *INDENT-ON* +{ + BorderSize border_size{ static_cast(size) }; + + std::mt19937 generator(library->seed()); + std::uniform_int_distribution distribution_u8(0, 255); + const uint8_t border_value = distribution_u8(generator); + const uint8_t tensor_value = distribution_u8(generator); + + // Create tensors + Tensor src = create_tensor(shape, data_type); + + src.info()->extend_padding(padding); + + // Allocate tensor + src.allocator()->allocate(); + + // Check padding is as required + validate(src.info()->padding(), padding); + + // Fill tensor with constant value + std::uniform_int_distribution distribution{ tensor_value, tensor_value }; + library->fill(Accessor(src), distribution, 0); + + // Create and configure kernel + NEFillBorderKernel fill_border; + fill_border.configure(&src, border_size, border_mode, border_value); + + // Run kernel + fill_border.run(fill_border.window(), ThreadInfo()); + + // Validate border + border_size.limit(padding); + validate(Accessor(src), border_size, border_mode, &border_value); + + // Validate tensor + validate(Accessor(src), &tensor_value); +} + +TEST_SUITE_END() +TEST_SUITE_END() +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation_old/CL/FillBorder.cpp b/tests/validation_old/CL/FillBorder.cpp deleted file mode 100644 index deb40a1a5a..0000000000 --- a/tests/validation_old/CL/FillBorder.cpp +++ /dev/null @@ -1,89 +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 "CL/CLAccessor.h" -#include "Utils.h" -#include "tests/AssetsLibrary.h" -#include "tests/Globals.h" -#include "tests/validation_old/Datasets.h" -#include "tests/validation_old/Validation.h" -#include "utils/TypePrinter.h" - -#include "arm_compute/core/CL/kernels/CLFillBorderKernel.h" -#include "arm_compute/core/Helpers.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CL/CLScheduler.h" -#include "arm_compute/runtime/CL/CLTensor.h" -#include "arm_compute/runtime/CL/CLTensorAllocator.h" - -#include "tests/validation_old/boost_wrapper.h" - -#include -#include - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(CL) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(FillBorder, BorderModes() * boost::unit_test::data::make({ PaddingSize{ 0 }, PaddingSize{ 1, 0, 1, 2 }, PaddingSize{ 10 } }), border_mode, padding) -{ - constexpr uint8_t border_value = 42U; - constexpr uint8_t tensor_value = 89U; - BorderSize border_size{ 5 }; - - // Create tensors - CLTensor src = create_tensor(TensorShape{ 10U, 10U, 2U }, DataType::U8); - - src.info()->extend_padding(padding); - - // Allocate tensor - src.allocator()->allocate(); - - // Check padding is as required - validate(src.info()->padding(), padding); - - // Fill tensor with constant value - std::uniform_int_distribution distribution{ tensor_value, tensor_value }; - library->fill(CLAccessor(src), distribution, 0); - - // Create and configure kernel - CLFillBorderKernel fill_border; - fill_border.configure(&src, border_size, border_mode, border_value); - - // Run kernel - fill_border.run(fill_border.window(), CLScheduler::get().queue()); - - // Validate border - border_size.limit(padding); - validate(CLAccessor(src), border_size, border_mode, &border_value); - - // Validate tensor - validate(CLAccessor(src), &tensor_value); -} - -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ diff --git a/tests/validation_old/NEON/FillBorder.cpp b/tests/validation_old/NEON/FillBorder.cpp deleted file mode 100644 index cbf637e7f8..0000000000 --- a/tests/validation_old/NEON/FillBorder.cpp +++ /dev/null @@ -1,88 +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 "NEON/Accessor.h" -#include "Utils.h" -#include "tests/AssetsLibrary.h" -#include "tests/Globals.h" -#include "tests/validation_old/Datasets.h" -#include "tests/validation_old/Validation.h" -#include "utils/TypePrinter.h" - -#include "arm_compute/core/Helpers.h" -#include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/Tensor.h" -#include "arm_compute/runtime/TensorAllocator.h" - -#include "tests/validation_old/boost_wrapper.h" - -#include -#include - -using namespace arm_compute; -using namespace arm_compute::test; -using namespace arm_compute::test::validation; - -#ifndef DOXYGEN_SKIP_THIS -BOOST_AUTO_TEST_SUITE(NEON) - -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly")) -BOOST_DATA_TEST_CASE(FillBorder, BorderModes() * boost::unit_test::data::make({ PaddingSize{ 0 }, PaddingSize{ 1, 0, 1, 2 }, PaddingSize{ 10 } }), border_mode, padding) -{ - constexpr uint8_t border_value = 42U; - constexpr uint8_t tensor_value = 89U; - BorderSize border_size{ 5 }; - - // Create tensors - Tensor src = create_tensor(TensorShape{ 10U, 10U, 2U }, DataType::U8); - - src.info()->extend_padding(padding); - - // Allocate tensor - src.allocator()->allocate(); - - // Check padding is as required - validate(src.info()->padding(), padding); - - // Fill tensor with constant value - std::uniform_int_distribution distribution{ tensor_value, tensor_value }; - library->fill(Accessor(src), distribution, 0); - - // Create and configure kernel - NEFillBorderKernel fill_border; - fill_border.configure(&src, border_size, border_mode, border_value); - - // Run kernel - fill_border.run(fill_border.window(), ThreadInfo()); - - // Validate border - border_size.limit(padding); - validate(Accessor(src), border_size, border_mode, &border_value); - - // Validate tensor - validate(Accessor(src), &tensor_value); -} - -BOOST_AUTO_TEST_SUITE_END() -#endif /* DOXYGEN_SKIP_THIS */ diff --git a/utils/TypePrinter.h b/utils/TypePrinter.h index 4ea9326b2b..758034884c 100644 --- a/utils/TypePrinter.h +++ b/utils/TypePrinter.h @@ -578,6 +578,13 @@ inline std::string to_string(const BorderMode &mode) return str.str(); } +inline std::string to_string(const BorderSize &border) +{ + std::stringstream str; + str << border; + return str.str(); +} + inline std::string to_string(const InterpolationPolicy &policy) { std::stringstream str; -- cgit v1.2.1