From d7647d4ebd0f0b5253b7f31ffcd48a851ba62947 Mon Sep 17 00:00:00 2001 From: Giuseppe Rossini Date: Tue, 17 Jul 2018 18:13:13 +0100 Subject: [COMPMID-1229] Implementing Pad on OpenCL -FP32/FP16 Change-Id: Ideead99410e5e0bda1035030af1bbcd0a65ea15e Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/144792 Tested-by: bsgcomp Reviewed-by: Georgios Pinitas --- tests/validation/CL/Padding.cpp | 135 ++++++++++++++++++++++++++++ tests/validation/fixtures/PadLayerFixture.h | 112 +++++++++++++++++++++++ tests/validation/reference/PadLayer.cpp | 109 ++++++++++++++++++++++ tests/validation/reference/PadLayer.h | 53 +++++++++++ 4 files changed, 409 insertions(+) create mode 100644 tests/validation/CL/Padding.cpp create mode 100644 tests/validation/fixtures/PadLayerFixture.h create mode 100644 tests/validation/reference/PadLayer.cpp create mode 100644 tests/validation/reference/PadLayer.h (limited to 'tests/validation') diff --git a/tests/validation/CL/Padding.cpp b/tests/validation/CL/Padding.cpp new file mode 100644 index 0000000000..2548226e65 --- /dev/null +++ b/tests/validation/CL/Padding.cpp @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2018 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/runtime/CL/CLScheduler.h" +#include "arm_compute/runtime/CL/functions/CLPadLayer.h" +#include "tests/CL/CLAccessor.h" +#include "tests/Globals.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/PadLayerFixture.h" +#include "utils/TypePrinter.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +const auto PaddingSizesDataset = framework::dataset::make("PaddingSize", { PaddingList{ { 0, 0 } }, + PaddingList{ { 1, 1 } }, + PaddingList{ { 1, 1 }, { 2, 2 } }, + PaddingList{ { 1, 1 }, { 1, 1 }, { 1, 1 }, { 1, 1 } }, + PaddingList{ { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 2 } }, + PaddingList{ { 0, 0 }, { 0, 0 }, { 0, 0 }, { 1, 1 } } +}); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(Padding) + +// *INDENT-OFF* +// clang-format off + +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching data type input/output + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), // Mismatching shapes + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32) + }), + framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(27U, 13U, 2U), 1, DataType::F16), + TensorInfo(TensorShape(28U, 11U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(29U, 17U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(29U, 15U, 4U, 3U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 14U, 3U, 4U), 1, DataType::F32), + TensorInfo(TensorShape(32U, 13U, 2U, 3U), 1, DataType::F32) + })), + framework::dataset::make("PaddingSize", { PaddingList{{0, 0}}, + PaddingList{{1, 1}}, + PaddingList{{1, 1}, {2, 2}}, + PaddingList{{1,1}, {1,1}, {1,1}, {1,1}}, + PaddingList{{0,0}, {1,0}, {0,1}, {1,2}}, + PaddingList{{0,0}, {0,0}, {0,0}, {1,1}} + })), + framework::dataset::make("Expected", { false, false, true, true, true, true })), + input_info, output_info, padding, expected) +{ + ARM_COMPUTE_EXPECT(bool(CLPadLayer::validate(&input_info.clone()->set_is_resizable(true), &output_info.clone()->set_is_resizable(true), padding)) == expected, framework::LogLevel::ERRORS); +} + +// clang-format on +// *INDENT-ON* + +template +using CLPaddingFixture = PaddingFixture; + +TEST_SUITE(Float) + +TEST_SUITE(FP32) + +FIXTURE_DATA_TEST_CASE(RunPadding, CLPaddingFixture, framework::DatasetMode::ALL, + combine( + combine(datasets::SmallShapes(), framework::dataset::make("DataType", { DataType::F32 })), + PaddingSizesDataset)) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +TEST_SUITE_END() // FP32 + +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunPadding, CLPaddingFixture, framework::DatasetMode::ALL, + combine( + combine(datasets::SmallShapes(), framework::dataset::make("DataType", { DataType::F16 })), + PaddingSizesDataset)) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // FP16 + +TEST_SUITE_END() // Float + +TEST_SUITE(S8) +FIXTURE_DATA_TEST_CASE(RunPadding, CLPaddingFixture, framework::DatasetMode::ALL, + combine( + combine(datasets::SmallShapes(), framework::dataset::make("DataType", { DataType::S8 })), + PaddingSizesDataset)) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // S8 + +TEST_SUITE_END() // Padding +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/PadLayerFixture.h b/tests/validation/fixtures/PadLayerFixture.h new file mode 100644 index 0000000000..72ce57dc9f --- /dev/null +++ b/tests/validation/fixtures/PadLayerFixture.h @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2018 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. + */ +#ifndef ARM_COMPUTE_TEST_PADLAYER_FIXTURE +#define ARM_COMPUTE_TEST_PADLAYER_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/functions/CLPadLayer.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/Helpers.h" +#include "tests/validation/reference/PadLayer.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class PaddingFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, DataType data_type, const PaddingList &padding) + { + _target = compute_target(shape, data_type, padding); + _reference = compute_reference(shape, data_type, padding); + } + +protected: + template + void fill(U &&tensor) + { + library->fill_tensor_uniform(tensor, 0); + } + + TensorType compute_target(const TensorShape &shape, + DataType data_type, + const PaddingList &paddings) + { + // Create tensors + TensorType src = create_tensor(shape, data_type); + TensorType dst; + + // Create and configure function + FunctionType padding; + padding.configure(&src, &dst, paddings); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src)); + + // Compute function + padding.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, DataType data_type, + const PaddingList &paddings) + { + // Create reference tensor + SimpleTensor src{ shape, data_type }; + + // Fill reference tensor + fill(src); + + return reference::pad_layer(src, paddings); + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; + +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_PADLAYER_FIXTURE */ diff --git a/tests/validation/reference/PadLayer.cpp b/tests/validation/reference/PadLayer.cpp new file mode 100644 index 0000000000..0a3b38d697 --- /dev/null +++ b/tests/validation/reference/PadLayer.cpp @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2018 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 "PadLayer.h" + +#include "arm_compute/core/Types.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings) +{ + DataType dst_data_type = src.data_type(); + + TensorShape orig_shape = src.shape(); + + std::vector paddings_extended = paddings; + + for(size_t i = paddings.size(); i < TensorShape::num_max_dimensions; i++) + { + paddings_extended.emplace_back(PaddingInfo{ 0, 0 }); + } + + TensorShape padded_shape = misc::shape_calculator::compute_padded_shape(orig_shape, paddings); + + SimpleTensor dst(padded_shape, dst_data_type); + + // Reference algorithm: loop over the different dimension of the input. + for(int idx = 0; idx < dst.num_elements(); idx++) + { + Coordinates coord = index2coord(padded_shape, idx); + + const size_t i = coord.x(); + const size_t j = coord.y(); + const size_t k = coord.z(); + const size_t l = coord[3]; + const size_t m = coord[4]; + const size_t n = coord[5]; + + std::array dims = { 0, 1, 2, 3, 4, 5 }; + std::array coords = { i, j, k, l, m, n }; + auto is_padding_area = [&](size_t i) + { + return (coords[i] < paddings_extended[i].first || coords[i] > orig_shape[i] + paddings_extended[i].first - 1); + }; + + // If the tuple [i,j,k,l,m] is in the padding area, then seimply set the value + if(std::any_of(dims.begin(), dims.end(), is_padding_area)) + { + dst[idx] = T(0); + } + else + { + // If the tuple[i,j,k,l,m] is not in the padding area, then copy the input into the output + + Coordinates orig_coords{ i - paddings_extended[0].first, + j - paddings_extended[1].first, + k - paddings_extended[2].first, + l - paddings_extended[3].first, + m - paddings_extended[4].first, + n - paddings_extended[5].first }; + + const size_t idx_src = coord2index(orig_shape, orig_coords); + dst[idx] = src[idx_src]; + } + } + + return dst; +} + +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +template SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/PadLayer.h b/tests/validation/reference/PadLayer.h new file mode 100644 index 0000000000..9406b05c4d --- /dev/null +++ b/tests/validation/reference/PadLayer.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018 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. + */ +#ifndef __ARM_COMPUTE_TEST_PADLAYER_H__ +#define __ARM_COMPUTE_TEST_PADLAYER_H__ + +#include "arm_compute/core/Types.h" +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +/** Reference function to pad an ND tensor. This function is not supposed to be optimized, but to + * clearly and naively execute the padding of a tensor + * + * @param[in] src Tensor to pad + * @param[in] paddings Padding size in each dimension + * + * @return The padded Tensor + */ +template +SimpleTensor pad_layer(const SimpleTensor &src, const PaddingList &paddings); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_PADLAYER_H__ */ -- cgit v1.2.1