From c1a72451273ec019e3e74c4b53ea847afe8ddf7c Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 24 Aug 2018 11:25:32 +0100 Subject: COMPMID-1332: Implement Slice for CL Change-Id: I0dbc4fd7f640d31daa1970eb3da0e941cb771f2b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/146145 Tested-by: Jenkins Reviewed-by: Giorgio Arena Reviewed-by: Michalis Spyrou --- tests/validation/CL/Slice.cpp | 133 +++++++++++++++ tests/validation/CL/StridedSlice.cpp | 4 +- .../validation/fixtures/SliceOperationsFixtures.h | 182 +++++++++++++++++++++ tests/validation/fixtures/StridedSliceFixture.h | 119 -------------- tests/validation/reference/SliceOperations.cpp | 137 ++++++++++++++++ tests/validation/reference/SliceOperations.h | 48 ++++++ tests/validation/reference/StridedSlice.cpp | 92 ----------- tests/validation/reference/StridedSlice.h | 45 ----- 8 files changed, 502 insertions(+), 258 deletions(-) create mode 100644 tests/validation/CL/Slice.cpp create mode 100644 tests/validation/fixtures/SliceOperationsFixtures.h delete mode 100644 tests/validation/fixtures/StridedSliceFixture.h create mode 100644 tests/validation/reference/SliceOperations.cpp create mode 100644 tests/validation/reference/SliceOperations.h delete mode 100644 tests/validation/reference/StridedSlice.cpp delete mode 100644 tests/validation/reference/StridedSlice.h (limited to 'tests/validation') diff --git a/tests/validation/CL/Slice.cpp b/tests/validation/CL/Slice.cpp new file mode 100644 index 0000000000..91c2e90c07 --- /dev/null +++ b/tests/validation/CL/Slice.cpp @@ -0,0 +1,133 @@ +/* + * 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/CLSlice.h" + +#include "tests/CL/CLAccessor.h" +#include "tests/datasets/SliceOperationsDataset.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/SliceOperationsFixtures.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(CL) +TEST_SUITE(Slice) + +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 3U, 2U, 5U, 3U), 1, DataType::F32), // Invalid input shape + TensorInfo(TensorShape(27U, 3U, 2U), 1, DataType::F32), // Negative begin + TensorInfo(TensorShape(27U, 3U, 2U), 1, DataType::F32), // Big number of coordinates + TensorInfo(TensorShape(27U, 3U, 2U), 1, DataType::F32) + }), + framework::dataset::make("Starts", { Coordinates(3, 1, 0), Coordinates(-3, 1, 0), Coordinates(3, 1, 0), Coordinates(3, 1, 0) })), + framework::dataset::make("Ends", { Coordinates(13, 3, 0), Coordinates(13, 3, 1), Coordinates(13, 3, 1, 1), Coordinates(13, 3, 1) })), + framework::dataset::make("Expected", { false, false, false, true })), + input_info, starts, ends, expected) +{ + TensorInfo output_info; + const Status status = CLSlice::validate(&input_info.clone()->set_is_resizable(false), &output_info, starts, ends); + ARM_COMPUTE_EXPECT(bool(status) == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* + +DATA_TEST_CASE(Configuration, + framework::DatasetMode::ALL, + combine(arm_compute::test::datasets::SmallSliceDataset(), framework::dataset::make("DataType", { DataType::F16, DataType::F32 })), + shape, starts, ends, data_type) +{ + // Create tensors + CLTensor src = create_tensor(shape, data_type); + CLTensor dst; + + // Create and Configure function + CLSlice slice; + slice.configure(&src, &dst, starts, ends); + + // Validate valid region + const ValidRegion valid_region = shape_to_valid_region(dst.info()->tensor_shape()); + validate(dst.info()->valid_region(), valid_region); +} + +template +using CLSliceFixture = SliceFixture; + +TEST_SUITE(Float) +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLSliceFixture, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallSliceDataset(), framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLSliceFixture, + framework::DatasetMode::NIGHTLY, + combine(datasets::LargeSliceDataset(), framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // FP16 + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLSliceFixture, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallSliceDataset(), framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLSliceFixture, + framework::DatasetMode::NIGHTLY, + combine(datasets::LargeSliceDataset(), framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // FP32 +TEST_SUITE_END() // Float + +TEST_SUITE_END() // Slice +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/CL/StridedSlice.cpp b/tests/validation/CL/StridedSlice.cpp index 824f7b1cf3..00eee168f9 100644 --- a/tests/validation/CL/StridedSlice.cpp +++ b/tests/validation/CL/StridedSlice.cpp @@ -28,12 +28,12 @@ #include "tests/CL/CLAccessor.h" #include "tests/PaddingCalculator.h" -#include "tests/datasets/StridedSliceDataset.h" +#include "tests/datasets/SliceOperationsDataset.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/StridedSliceFixture.h" +#include "tests/validation/fixtures/SliceOperationsFixtures.h" namespace arm_compute { diff --git a/tests/validation/fixtures/SliceOperationsFixtures.h b/tests/validation/fixtures/SliceOperationsFixtures.h new file mode 100644 index 0000000000..018bafba6c --- /dev/null +++ b/tests/validation/fixtures/SliceOperationsFixtures.h @@ -0,0 +1,182 @@ +/* + * 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_STRIDED_SLICE_FIXTURE +#define ARM_COMPUTE_TEST_STRIDED_SLICE_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" + +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/RawLutAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/Helpers.h" +#include "tests/validation/reference/SliceOperations.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class SliceFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, Coordinates starts, Coordinates ends, DataType data_type) + { + _target = compute_target(shape, starts, ends, data_type); + _reference = compute_reference(shape, starts, ends, data_type); + } + +protected: + template + void fill(U &&tensor, int i) + { + library->fill_tensor_uniform(tensor, i); + } + + TensorType compute_target(const TensorShape &shape, const Coordinates &starts, const Coordinates &ends, DataType data_type) + { + // Create tensors + TensorType src = create_tensor(shape, data_type); + TensorType dst; + + // Create and configure function + FunctionType slice; + slice.configure(&src, &dst, starts, ends); + + 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), 0); + fill(AccessorType(dst), 1); + + // Compute function + slice.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, const Coordinates &starts, const Coordinates &ends, DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type }; + + // Fill reference + fill(src, 0); + + return reference::slice(src, starts, ends); + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; + +template +class StridedSliceFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, + Coordinates starts, Coordinates ends, BiStrides strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_mask, + DataType data_type) + { + _target = compute_target(shape, starts, ends, strides, begin_mask, end_mask, shrink_mask, data_type); + _reference = compute_reference(shape, starts, ends, strides, begin_mask, end_mask, shrink_mask, data_type); + } + +protected: + template + void fill(U &&tensor, int i) + { + library->fill_tensor_uniform(tensor, i); + } + + TensorType compute_target(const TensorShape &shape, + const Coordinates &starts, const Coordinates &ends, const BiStrides &strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_mask, + DataType data_type) + { + // Create tensors + TensorType src = create_tensor(shape, data_type); + TensorType dst; + + // Create and configure function + FunctionType strided_slice; + strided_slice.configure(&src, &dst, starts, ends, strides, begin_mask, end_mask, shrink_mask); + + 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), 0); + fill(AccessorType(dst), 1); + + // Compute function + strided_slice.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, + const Coordinates &starts, const Coordinates &ends, const BiStrides &strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_mask, + DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type }; + + // Fill reference + fill(src, 0); + + return reference::strided_slice(src, starts, ends, strides, begin_mask, end_mask, shrink_mask); + } + + TensorType _target{}; + SimpleTensor _reference{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_STRIDED_SLICE_FIXTURE */ diff --git a/tests/validation/fixtures/StridedSliceFixture.h b/tests/validation/fixtures/StridedSliceFixture.h deleted file mode 100644 index 26442ad834..0000000000 --- a/tests/validation/fixtures/StridedSliceFixture.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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_STRIDED_SLICE_FIXTURE -#define ARM_COMPUTE_TEST_STRIDED_SLICE_FIXTURE - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" - -#include "tests/AssetsLibrary.h" -#include "tests/Globals.h" -#include "tests/IAccessor.h" -#include "tests/RawLutAccessor.h" -#include "tests/framework/Asserts.h" -#include "tests/framework/Fixture.h" -#include "tests/validation/Helpers.h" -#include "tests/validation/reference/StridedSlice.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -template -class StridedSliceFixture : public framework::Fixture -{ -public: - template - void setup(TensorShape shape, - Coordinates starts, Coordinates ends, BiStrides strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_mask, - DataType data_type) - { - _target = compute_target(shape, starts, ends, strides, begin_mask, end_mask, shrink_mask, data_type); - _reference = compute_reference(shape, starts, ends, strides, begin_mask, end_mask, shrink_mask, data_type); - } - -protected: - template - void fill(U &&tensor, int i) - { - library->fill_tensor_uniform(tensor, i); - } - - TensorType compute_target(const TensorShape &shape, - const Coordinates &starts, const Coordinates &ends, const BiStrides &strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_mask, - DataType data_type) - { - // Create tensors - TensorType src = create_tensor(shape, data_type); - TensorType dst; - - // Create and configure function - FunctionType strided_slice; - strided_slice.configure(&src, &dst, starts, ends, strides, begin_mask, end_mask, shrink_mask); - - 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), 0); - fill(AccessorType(dst), 1); - - // Compute function - strided_slice.run(); - - return dst; - } - - SimpleTensor compute_reference(const TensorShape &shape, - const Coordinates &starts, const Coordinates &ends, const BiStrides &strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_mask, - DataType data_type) - { - // Create reference - SimpleTensor src{ shape, data_type }; - - // Fill reference - fill(src, 0); - - return reference::strided_slice(src, starts, ends, strides, begin_mask, end_mask, shrink_mask); - } - - TensorType _target{}; - SimpleTensor _reference{}; -}; -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_STRIDED_SLICE_FIXTURE */ diff --git a/tests/validation/reference/SliceOperations.cpp b/tests/validation/reference/SliceOperations.cpp new file mode 100644 index 0000000000..04b5b98453 --- /dev/null +++ b/tests/validation/reference/SliceOperations.cpp @@ -0,0 +1,137 @@ +/* + * 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 "SliceOperations.h" + +#include "arm_compute/core/utils/helpers/tensor_transform.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor slice(const SimpleTensor &src, Coordinates starts, Coordinates ends) +{ + using namespace arm_compute::helpers::tensor_transform; + + // Validation checks + ARM_COMPUTE_ERROR_ON(src.shape().num_dimensions() > 4); + ARM_COMPUTE_ERROR_ON(starts.num_dimensions() > src.shape().num_dimensions()); + ARM_COMPUTE_ERROR_ON(std::any_of(starts.cbegin(), starts.cbegin() + starts.num_dimensions(), [](int i) + { + return i < 0; + })); + ARM_COMPUTE_ERROR_ON(ends.num_dimensions() > src.shape().num_dimensions()); + + // Get source shape + const TensorShape &src_shape = src.shape(); + + // Get actual end + Coordinates ends_abs = slice_absolute_end_coords(src_shape, ends); + + // Get destination shape + TensorShape dst_shape = compute_slice_output_shape(src_shape, starts, ends_abs); + + // Create destination tensor + SimpleTensor dst{ dst_shape, src.data_type(), 1 }; + + // Perform slice + Window win; + win.use_tensor_dimensions(dst_shape); + execute_window_loop(win, [&](const Coordinates & id) + { + Coordinates offset; + for(unsigned int i = 0; i < id.num_dimensions(); ++i) + { + offset.set(i, starts[i] + id[i]); + } + *reinterpret_cast(dst(id)) = *reinterpret_cast(src(offset)); + }); + + return dst; +} + +template SimpleTensor slice(const SimpleTensor &src, Coordinates starts, Coordinates ends); +template SimpleTensor slice(const SimpleTensor &src, Coordinates starts, Coordinates ends); + +template +SimpleTensor strided_slice(const SimpleTensor &src, + Coordinates starts, Coordinates ends, BiStrides strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask) +{ + using namespace arm_compute::helpers::tensor_transform; + + // Validation checks + ARM_COMPUTE_ERROR_ON(src.shape().num_dimensions() > 4); + ARM_COMPUTE_ERROR_ON(starts.num_dimensions() > src.shape().num_dimensions()); + ARM_COMPUTE_ERROR_ON(ends.num_dimensions() > src.shape().num_dimensions()); + ARM_COMPUTE_ERROR_ON(strides.num_dimensions() > src.shape().num_dimensions()); + ARM_COMPUTE_ERROR_ON(std::any_of(strides.cbegin(), strides.cbegin() + strides.num_dimensions(), [](int i) + { + return i == 0; + })); + + // Get source shape + const TensorShape &src_shape = src.shape(); + + // Get actual start, end coordinates and strides + const Coordinates final_strides = strided_slice_strides(src_shape, strides); + const Coordinates starts_abs = strided_slice_absolute_start_coords(src_shape, starts, final_strides, begin_mask); + const Coordinates ends_abs = strided_slice_absolute_end_coords(src_shape, starts_abs, ends, final_strides, end_mask, shrink_axis_mask); + + // Get destination shape + const TensorShape dst_shape = compute_strided_slice_output_shape(src_shape, starts_abs, ends_abs, final_strides); + + // Create destination tensor + SimpleTensor dst{ dst_shape, src.data_type(), 1 }; + + // Perform strided slice + Window win; + win.use_tensor_dimensions(dst_shape); + execute_window_loop(win, [&](const Coordinates & id) + { + Coordinates offset; + for(unsigned int i = 0; i < id.num_dimensions(); ++i) + { + offset.set(i, starts_abs[i] + id[i] * final_strides[i]); + } + *reinterpret_cast(dst(id)) = *reinterpret_cast(src(offset)); + }); + + return dst; +} + +template SimpleTensor strided_slice(const SimpleTensor &src, + Coordinates starts, Coordinates ends, BiStrides strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask); +template SimpleTensor strided_slice(const SimpleTensor &src, + Coordinates starts, Coordinates ends, BiStrides strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/SliceOperations.h b/tests/validation/reference/SliceOperations.h new file mode 100644 index 0000000000..89fe2038ed --- /dev/null +++ b/tests/validation/reference/SliceOperations.h @@ -0,0 +1,48 @@ +/* + * 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_SLICE_OPERATIONS_H__ +#define __ARM_COMPUTE_TEST_SLICE_OPERATIONS_H__ + +#include "tests/SimpleTensor.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor slice(const SimpleTensor &src, Coordinates starts, Coordinates ends); + +template +SimpleTensor strided_slice(const SimpleTensor &src, + Coordinates starts, Coordinates ends, BiStrides strides, + int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_SLICE_OPERATIONS_H__ */ diff --git a/tests/validation/reference/StridedSlice.cpp b/tests/validation/reference/StridedSlice.cpp deleted file mode 100644 index ac02ce1e71..0000000000 --- a/tests/validation/reference/StridedSlice.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * 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 "StridedSlice.h" - -#include "arm_compute/core/utils/helpers/tensor_transform.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace reference -{ -template -SimpleTensor strided_slice(const SimpleTensor &src, - Coordinates starts, Coordinates ends, BiStrides strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask) -{ - using namespace arm_compute::helpers::tensor_transform; - - // Validation checks - ARM_COMPUTE_ERROR_ON(src.shape().num_dimensions() > 4); - ARM_COMPUTE_ERROR_ON(starts.num_dimensions() > src.shape().num_dimensions()); - ARM_COMPUTE_ERROR_ON(ends.num_dimensions() > src.shape().num_dimensions()); - ARM_COMPUTE_ERROR_ON(strides.num_dimensions() > src.shape().num_dimensions()); - for(unsigned int i = 0; i < strides.num_dimensions(); ++i) - { - ARM_COMPUTE_ERROR_ON(strides[i] == 0); - } - - // Get source shape - const TensorShape &src_shape = src.shape(); - - // Get actual start, end coordinates and strides - const Coordinates final_strides = strided_slice_strides(src_shape, strides); - const Coordinates starts_abs = strided_slice_absolute_start_coords(src_shape, starts, final_strides, begin_mask); - const Coordinates ends_abs = strided_slice_absolute_end_coords(src_shape, starts_abs, ends, final_strides, end_mask, shrink_axis_mask); - - // Get destination shape - const TensorShape dst_shape = compute_strided_slice_output_shape(src_shape, starts_abs, ends_abs, final_strides); - - // Create destination tensor - SimpleTensor dst{ dst_shape, src.data_type(), 1 }; - - // Perform strided slice - Window win; - win.use_tensor_dimensions(dst_shape); - execute_window_loop(win, [&](const Coordinates & id) - { - Coordinates offset; - for(unsigned int i = 0; i < id.num_dimensions(); ++i) - { - offset.set(i, starts_abs[i] + id[i] * final_strides[i]); - } - *reinterpret_cast(dst(id)) = *reinterpret_cast(src(offset)); - }); - - return dst; -} - -template SimpleTensor strided_slice(const SimpleTensor &src, - Coordinates starts, Coordinates ends, BiStrides strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask); -template SimpleTensor strided_slice(const SimpleTensor &src, - Coordinates starts, Coordinates ends, BiStrides strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/reference/StridedSlice.h b/tests/validation/reference/StridedSlice.h deleted file mode 100644 index 805b7e65da..0000000000 --- a/tests/validation/reference/StridedSlice.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * 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_STRIDED_SLICE_H__ -#define __ARM_COMPUTE_TEST_STRIDED_SLICE_H__ - -#include "tests/SimpleTensor.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace reference -{ -template -SimpleTensor strided_slice(const SimpleTensor &src, - Coordinates starts, Coordinates ends, BiStrides strides, - int32_t begin_mask, int32_t end_mask, int32_t shrink_axis_mask); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* __ARM_COMPUTE_TEST_STRIDED_SLICE_H__ */ -- cgit v1.2.1