From 5daeffdd96c5e46ac2482431d578dfaf9b300cde Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Mon, 26 Nov 2018 10:01:15 +0000 Subject: COMPMID-1723: CL: Implement Reverse Change-Id: Id0d4a07af24e2331161996083b0c1bab072bd405 Reviewed-on: https://review.mlplatform.org/322 Reviewed-by: Georgios Pinitas Tested-by: Arm Jenkins --- tests/datasets/ShapeDatasets.h | 14 +++ tests/validation/CL/Reverse.cpp | 159 +++++++++++++++++++++++++++++ tests/validation/fixtures/ReverseFixture.h | 121 ++++++++++++++++++++++ tests/validation/reference/Reverse.cpp | 77 ++++++++++++++ tests/validation/reference/Reverse.h | 43 ++++++++ 5 files changed, 414 insertions(+) create mode 100644 tests/validation/CL/Reverse.cpp create mode 100644 tests/validation/fixtures/ReverseFixture.h create mode 100644 tests/validation/reference/Reverse.cpp create mode 100644 tests/validation/reference/Reverse.h (limited to 'tests') diff --git a/tests/datasets/ShapeDatasets.h b/tests/datasets/ShapeDatasets.h index ffacf34620..f7e7ae26b9 100644 --- a/tests/datasets/ShapeDatasets.h +++ b/tests/datasets/ShapeDatasets.h @@ -38,6 +38,20 @@ namespace datasets /** Parent type for all for shape datasets. */ using ShapeDataset = framework::dataset::ContainerDataset>; +/** Data set containing tiny 1D tensor shapes. */ +class Tiny1DShapes final : public ShapeDataset +{ +public: + Tiny1DShapes() + : ShapeDataset("Shape", + { + TensorShape{ 2U }, + TensorShape{ 3U }, + }) + { + } +}; + /** Data set containing small 1D tensor shapes. */ class Small1DShapes final : public ShapeDataset { diff --git a/tests/validation/CL/Reverse.cpp b/tests/validation/CL/Reverse.cpp new file mode 100644 index 0000000000..d18c490950 --- /dev/null +++ b/tests/validation/CL/Reverse.cpp @@ -0,0 +1,159 @@ +/* + * 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/core/Types.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/CLTensorAllocator.h" +#include "arm_compute/runtime/CL/functions/CLReverse.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/ReverseFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +auto run_small_dataset = combine(datasets::SmallShapes(), datasets::Tiny1DShapes()); +auto run_large_dataset = combine(datasets::LargeShapes(), datasets::Tiny1DShapes()); + +} // namespace +TEST_SUITE(CL) +TEST_SUITE(Reverse) + +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S8), // Invalid axis datatype + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Invalid axis shape + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Invalid axis length (> 4) + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), // Mismatching shapes + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(2U), 1, DataType::U8), + }), + framework::dataset::make("OutputInfo", { TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S8), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(2U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::U8), + TensorInfo(TensorShape(2U), 1, DataType::U8), + })), + framework::dataset::make("AxisInfo",{ TensorInfo(TensorShape(3U), 1, DataType::U8), + TensorInfo(TensorShape(2U, 10U), 1, DataType::U32), + TensorInfo(TensorShape(8U), 1, DataType::U32), + TensorInfo(TensorShape(2U), 1, DataType::U32), + TensorInfo(TensorShape(2U), 1, DataType::U32), + TensorInfo(TensorShape(2U), 1, DataType::U32), + })), + framework::dataset::make("Expected", { false, false, false, false, true, true})), + src_info, dst_info, axis_info, expected) +{ + Status s = CLReverse::validate(&src_info.clone()->set_is_resizable(false), + &dst_info.clone()->set_is_resizable(false), + &axis_info.clone()->set_is_resizable(false)); + ARM_COMPUTE_EXPECT(bool(s) == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* + +template +using CLReverseFixture = ReverseValidationFixture; + +TEST_SUITE(Float) +TEST_SUITE(F16) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLReverseFixture, + framework::DatasetMode::PRECOMMIT, + combine(run_small_dataset, framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLReverseFixture, + framework::DatasetMode::NIGHTLY, + combine(run_large_dataset, framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // F16 + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLReverseFixture, + framework::DatasetMode::PRECOMMIT, + combine(run_small_dataset, framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLReverseFixture, + framework::DatasetMode::NIGHTLY, + combine(run_large_dataset, framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // F32 +TEST_SUITE_END() // Float + +TEST_SUITE(Quantized) +TEST_SUITE(QASYMM8) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLReverseFixture, + framework::DatasetMode::PRECOMMIT, + combine(run_small_dataset, framework::dataset::make("DataType", DataType::QASYMM8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLReverseFixture, + framework::DatasetMode::NIGHTLY, + combine(run_large_dataset, framework::dataset::make("DataType", DataType::QASYMM8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // QASYMM8 +TEST_SUITE_END() // Quantized + +TEST_SUITE_END() // Reverse +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/ReverseFixture.h b/tests/validation/fixtures/ReverseFixture.h new file mode 100644 index 0000000000..172357c4b7 --- /dev/null +++ b/tests/validation/fixtures/ReverseFixture.h @@ -0,0 +1,121 @@ +/* + * 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_REVERSE_FIXTURE +#define ARM_COMPUTE_TEST_REVERSE_FIXTURE + +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/runtime/Tensor.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/reference/Reverse.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class ReverseValidationFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, TensorShape axis_shape, DataType data_type) + { + _target = compute_target(shape, axis_shape, data_type); + _reference = compute_reference(shape, axis_shape, data_type); + } + +protected: + template + void fill(U &&tensor) + { + library->fill_tensor_uniform(tensor, 0); + } + template + void fill_axis(U &&tensor) + { + std::uniform_int_distribution<> distribution(0, 3); + library->fill(tensor, distribution, 0); + } + + TensorType compute_target(const TensorShape &shape, const TensorShape &axis_shape, DataType data_type) + { + // Create tensors + TensorType src = create_tensor(shape, data_type, 1); + TensorType axis = create_tensor(axis_shape, DataType::U32, 1); + TensorType dst; + + // Create and configure function + FunctionType reverse_func; + reverse_func.configure(&src, &dst, &axis); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(axis.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + axis.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!axis.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src)); + fill_axis(AccessorType(axis)); + + // Compute function + reverse_func.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, const TensorShape &axis_shape, DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type }; + SimpleTensor axis{ axis_shape, DataType::U32 }; + + // Fill reference + fill(src); + fill_axis(axis); + + return reference::reverse(src, axis); + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_REVERSE_FIXTURE */ diff --git a/tests/validation/reference/Reverse.cpp b/tests/validation/reference/Reverse.cpp new file mode 100644 index 0000000000..1662dc24a0 --- /dev/null +++ b/tests/validation/reference/Reverse.cpp @@ -0,0 +1,77 @@ +/* + * 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 "Reverse.h" + +#include "arm_compute/core/Types.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor reverse(const SimpleTensor &src, const SimpleTensor &axis) +{ + ARM_COMPUTE_ERROR_ON(axis.shape().num_dimensions() > 1); + ARM_COMPUTE_ERROR_ON(axis.shape().x() > 4); + + // Create reference + SimpleTensor dst{ src.shape(), src.data_type(), src.num_channels(), src.quantization_info() }; + + const unsigned int width = src.shape()[0]; + const unsigned int height = src.shape()[1]; + const unsigned int depth = src.shape()[2]; + const unsigned int batches = src.shape()[3]; + + std::array to_reverse = { { false, false, false, false } }; + for(int i = 0; i < axis.num_elements(); ++i) + { + to_reverse[axis[i]] = true; + } + + for(int i = 0; i < src.num_elements(); ++i) + { + const Coordinates src_coord = index2coord(src.shape(), i); + const unsigned int dst_x = to_reverse[0] ? width - src_coord[0] - 1 : src_coord[0]; + const unsigned int dst_y = to_reverse[1] ? height - src_coord[1] - 1 : src_coord[1]; + const unsigned int dst_z = to_reverse[2] ? depth - src_coord[2] - 1 : src_coord[2]; + const unsigned int dst_w = to_reverse[3] ? batches - src_coord[3] - 1 : src_coord[3]; + + dst[coord2index(src.shape(), Coordinates(dst_x, dst_y, dst_z, dst_w))] = src[i]; + } + + return dst; +} + +template SimpleTensor reverse(const SimpleTensor &src, const SimpleTensor &axis); +template SimpleTensor reverse(const SimpleTensor &src, const SimpleTensor &axis); +template SimpleTensor reverse(const SimpleTensor &src, const SimpleTensor &axis); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/Reverse.h b/tests/validation/reference/Reverse.h new file mode 100644 index 0000000000..a5ff7b066f --- /dev/null +++ b/tests/validation/reference/Reverse.h @@ -0,0 +1,43 @@ +/* + * 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_REVERSE_H__ +#define __ARM_COMPUTE_TEST_REVERSE_H__ + +#include "tests/SimpleTensor.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor reverse(const SimpleTensor &src, const SimpleTensor &axis); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_REVERSE_H__ */ -- cgit v1.2.1