diff options
author | Manuel Bottini <manuel.bottini@arm.com> | 2018-11-21 11:53:04 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-01-07 10:54:47 +0000 |
commit | 8529bd68d8a979874b8c53c0e26af411aae058f5 (patch) | |
tree | b20826ece1b05b13ccc8b9fd5ee2c7ced1e498f9 /tests | |
parent | 1bf5e289ec08c6eb507c079fd16c877559b45684 (diff) | |
download | ComputeLibrary-8529bd68d8a979874b8c53c0e26af411aae058f5.tar.gz |
COMPMID-1727 - CL: Implement Gather
Change-Id: I3d859da09a4de1019bb8c2046725eab942247927
Reviewed-on: https://review.mlplatform.org/386
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/datasets/GatherDataset.h | 169 | ||||
-rw-r--r-- | tests/validation/CL/Gather.cpp | 210 | ||||
-rw-r--r-- | tests/validation/fixtures/GatherFixture.h | 142 | ||||
-rw-r--r-- | tests/validation/reference/Gather.cpp | 75 | ||||
-rw-r--r-- | tests/validation/reference/Gather.h | 46 |
5 files changed, 642 insertions, 0 deletions
diff --git a/tests/datasets/GatherDataset.h b/tests/datasets/GatherDataset.h new file mode 100644 index 0000000000..29f2cccf57 --- /dev/null +++ b/tests/datasets/GatherDataset.h @@ -0,0 +1,169 @@ +/* + * Copyright (c) 2018-2019 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_GATHER_DATASET +#define ARM_COMPUTE_TEST_GATHER_DATASET + +#include "utils/TypePrinter.h" + +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +namespace test +{ +namespace datasets +{ +class GatherDataset +{ +public: + using type = std::tuple<TensorShape, TensorShape, int>; + + struct iterator + { + iterator(std::vector<TensorShape>::const_iterator input_shapes_it, + std::vector<TensorShape>::const_iterator starts_values_it, + std::vector<int>::const_iterator axis_it) + : _input_shapes_it{ std::move(input_shapes_it) }, + _indices_shapes_it{ std::move(starts_values_it) }, + _axis_it{ std::move(axis_it) } + { + } + + std::string description() const + { + std::stringstream description; + description << "InputShape=" << *_input_shapes_it << ":"; + description << "IndicesShape=" << *_indices_shapes_it << ":"; + description << "Axis=" << *_axis_it << ":"; + return description.str(); + } + + GatherDataset::type operator*() const + { + return std::make_tuple(*_input_shapes_it, *_indices_shapes_it, *_axis_it); + } + + iterator &operator++() + { + ++_input_shapes_it; + ++_indices_shapes_it; + ++_axis_it; + return *this; + } + + private: + std::vector<TensorShape>::const_iterator _input_shapes_it; + std::vector<TensorShape>::const_iterator _indices_shapes_it; + std::vector<int>::const_iterator _axis_it; + }; + + iterator begin() const + { + return iterator(_input_shapes.begin(), _indices_shapes.begin(), _axis.begin()); + } + + int size() const + { + return std::min(_input_shapes.size(), std::min(_indices_shapes.size(), _axis.size())); + } + + void add_config(TensorShape input_shape, TensorShape indices_shape, int axis) + { + _input_shapes.emplace_back(std::move(input_shape)); + _indices_shapes.emplace_back(std::move(indices_shape)); + _axis.emplace_back(std::move(axis)); + } + +protected: + GatherDataset() = default; + GatherDataset(GatherDataset &&) = default; + +private: + std::vector<TensorShape> _input_shapes{}; + std::vector<TensorShape> _indices_shapes{}; + std::vector<int> _axis{}; +}; + +class SmallGatherDataset final : public GatherDataset +{ +public: + SmallGatherDataset() + { + // 2D input + add_config(TensorShape(15U, 15U), TensorShape(5U), 0); + add_config(TensorShape(15U, 15U), TensorShape(5U), 1); + add_config(TensorShape(5U, 5U), TensorShape(80U), -1); + + // 3D input + add_config(TensorShape(5U, 5U, 5U), TensorShape(19U), 0); + add_config(TensorShape(5U, 4U, 6U), TensorShape(30U), 1); + add_config(TensorShape(3U, 5U, 7U), TensorShape(20U), 2); + add_config(TensorShape(5U, 4U, 6U), TensorShape(30U), -1); + add_config(TensorShape(3U, 5U, 7U), TensorShape(20U), -2); + + // 4D input + add_config(TensorShape(4U, 3U, 4U, 5U), TensorShape(4U), 0); + add_config(TensorShape(4U, 3U, 5U, 5U), TensorShape(5U), 1); + add_config(TensorShape(4U, 3U, 2U, 5U), TensorShape(6U), 2); + add_config(TensorShape(3U, 4U, 4U, 6U), TensorShape(7U), 3); + add_config(TensorShape(4U, 3U, 5U, 5U), TensorShape(5U), -1); + add_config(TensorShape(4U, 3U, 2U, 5U), TensorShape(6U), -2); + add_config(TensorShape(3U, 4U, 4U, 6U), TensorShape(7U), -3); + } +}; + +class LargeGatherDataset final : public GatherDataset +{ +public: + LargeGatherDataset() + { + // 2D input + add_config(TensorShape(150U, 150U), TensorShape(50U), 0); + add_config(TensorShape(150U, 150U), TensorShape(50U), 1); + add_config(TensorShape(150U, 150U), TensorShape(50U), -1); + + // 3D input + add_config(TensorShape(50U, 40U, 60U), TensorShape(33U), 0); + add_config(TensorShape(40U, 50U, 60U), TensorShape(24U), 1); + add_config(TensorShape(70U, 80U, 100U), TensorShape(50U), 2); + add_config(TensorShape(40U, 50U, 60U), TensorShape(24U), -1); + add_config(TensorShape(70U, 80U, 100U), TensorShape(50U), -2); + + // 4D input + add_config(TensorShape(30U, 40U, 20U, 20U), TensorShape(33U), 0); + add_config(TensorShape(23U, 10U, 60U, 20U), TensorShape(24U), 1); + add_config(TensorShape(14U, 20U, 10U, 31U), TensorShape(30U), 2); + add_config(TensorShape(34U, 10U, 40U, 20U), TensorShape(50U), 3); + add_config(TensorShape(23U, 10U, 60U, 20U), TensorShape(24U), -1); + add_config(TensorShape(14U, 20U, 10U, 31U), TensorShape(30U), -2); + add_config(TensorShape(34U, 10U, 40U, 20U), TensorShape(50U), -3); + } +}; + +} // namespace datasets +} // namespace test +} // namespace arm_compute + +#endif /* ARM_COMPUTE_TEST_GATHER_DATASET */ diff --git a/tests/validation/CL/Gather.cpp b/tests/validation/CL/Gather.cpp new file mode 100644 index 0000000000..cc892a30d1 --- /dev/null +++ b/tests/validation/CL/Gather.cpp @@ -0,0 +1,210 @@ +/* + * Copyright (c) 2018-2019 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/CLGather.h" + +#include "tests/CL/CLAccessor.h" +#include "tests/datasets/GatherDataset.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/GatherFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +TEST_SUITE(CL) +TEST_SUITE(Gather) + +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 27U), 1, DataType::F16), + TensorInfo(TensorShape(27U, 27U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 27U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 27U), 1, DataType::F32), // Invalid Indices data type + TensorInfo(TensorShape(27U, 27U), 1, DataType::F32), // Invalid Indices dimensionality + TensorInfo(TensorShape(5U, 5U, 5U, 5U, 5U), 1, DataType::F32), // Invalid Input dimensionality + TensorInfo(TensorShape(27U, 27U), 1, DataType::F16), // Mismatching data type input/output + TensorInfo(TensorShape(27U, 27U), 1, DataType::F32), // Invalid positive axis value + TensorInfo(TensorShape(27U, 27U), 1, DataType::F16), // Invalid negative axis value + }), + framework::dataset::make("IndicesInfo", { + TensorInfo(TensorShape(10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U8), + TensorInfo(TensorShape(10U, 10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U32), + TensorInfo(TensorShape(10U), 1, DataType::U32), + })), + framework::dataset::make("OutputInfo", { + TensorInfo(TensorShape(10U, 27U), 1, DataType::F16), + TensorInfo(TensorShape(27U, 10U), 1, DataType::F32), + TensorInfo(TensorShape(10U, 27U), 1, DataType::F32), + TensorInfo(TensorShape(10U, 27U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 10U), 1, DataType::F32), + TensorInfo(TensorShape(10U, 5U, 5U, 5U, 5U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 10U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 27U), 1, DataType::F32), + TensorInfo(TensorShape(27U, 27U), 1, DataType::F16), + })), + framework::dataset::make("Axis", { + 0, + 1, + -2, + 0, + 1, + 0, + 1, + 2, + -3, + })), + framework::dataset::make("Expected", { true, true, true, false, false, false, false, false, false })), + input_info, indices_info, output_info, axis, expected) +{ + const Status status = CLGather::validate(&input_info.clone()->set_is_resizable(true), &indices_info.clone()->set_is_resizable(true), &output_info.clone()->set_is_resizable(true), axis); + 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::SmallGatherDataset(), framework::dataset::make("DataType", { DataType::F16, DataType::F32 })), + input_shape, indices_shape, axis, data_type) +{ + const uint32_t actual_axis = wrap_around(axis, static_cast<int>(input_shape.num_dimensions())); + CLTensor src = create_tensor<CLTensor>(input_shape, data_type); + CLTensor indices = create_tensor<CLTensor>(indices_shape, DataType::U32); + TensorShape dst_shape = arm_compute::misc::shape_calculator::compute_gather_shape(input_shape, indices_shape, actual_axis); + CLTensor dst = create_tensor<CLTensor>(dst_shape, data_type); + + // Create and Configure function + CLGather gather; + gather.configure(&src, &indices, &dst, axis); + + // Validate valid region + const ValidRegion valid_region = shape_to_valid_region(dst.info()->tensor_shape()); + validate(dst.info()->valid_region(), valid_region); +} + +template <typename T> +using CLGatherFixture = GatherFixture<CLTensor, CLAccessor, CLGather, T>; + +TEST_SUITE(Float) +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLGatherFixture<half>, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallGatherDataset(), framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLGatherFixture<half>, + framework::DatasetMode::NIGHTLY, + combine(datasets::LargeGatherDataset(), framework::dataset::make("DataType", DataType::F16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // FP16 + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLGatherFixture<float>, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallGatherDataset(), framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLGatherFixture<float>, + framework::DatasetMode::NIGHTLY, + combine(datasets::LargeGatherDataset(), framework::dataset::make("DataType", DataType::F32))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // FP32 +TEST_SUITE_END() // Float + +TEST_SUITE(U8) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLGatherFixture<uint8_t>, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallGatherDataset(), framework::dataset::make("DataType", DataType::U8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLGatherFixture<uint8_t>, + framework::DatasetMode::NIGHTLY, + combine(datasets::LargeGatherDataset(), framework::dataset::make("DataType", DataType::U8))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // U8 + +TEST_SUITE(U16) +FIXTURE_DATA_TEST_CASE(RunSmall, + CLGatherFixture<uint16_t>, + framework::DatasetMode::PRECOMMIT, + combine(datasets::SmallGatherDataset(), framework::dataset::make("DataType", DataType::U16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, + CLGatherFixture<uint16_t>, + framework::DatasetMode::NIGHTLY, + combine(datasets::LargeGatherDataset(), framework::dataset::make("DataType", DataType::U16))) +{ + // Validate output + validate(CLAccessor(_target), _reference); +} +TEST_SUITE_END() // U16 + +TEST_SUITE_END() // Gather +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/GatherFixture.h b/tests/validation/fixtures/GatherFixture.h new file mode 100644 index 0000000000..f2dcd4a1a4 --- /dev/null +++ b/tests/validation/fixtures/GatherFixture.h @@ -0,0 +1,142 @@ +/* + * Copyright (c) 2018-2019 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_GATHER_FIXTURE +#define ARM_COMPUTE_TEST_GATHER_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" + +#include "arm_compute/core/utils/misc/ShapeCalculator.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/Gather.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template <typename TensorType, typename AccessorType, typename FunctionType, typename T> +class GatherFixture : public framework::Fixture +{ +public: + template <typename...> + void setup(TensorShape input_shape, TensorShape indices_shape, int axis, DataType data_type) + { + _target = compute_target(input_shape, data_type, axis, indices_shape); + _reference = compute_reference(input_shape, data_type, axis, indices_shape); + } + +protected: + template <typename U> + void fill(U &&tensor) + { + library->fill_tensor_uniform(tensor, 0); + } + + template <typename U> + void generate_indices(U &&indices, const TensorShape &input_shape, uint32_t actual_axis, TensorShape indices_shape) + { + std::mt19937 gen(library->seed()); + uint32_t *indices_ptr = static_cast<uint32_t *>(indices.data()); + + std::uniform_int_distribution<uint32_t> dist_index(0, input_shape[actual_axis] - 1); + //Let's consider 1D indices + for(unsigned int ind = 0; ind < indices_shape[0]; ind++) + { + indices_ptr[ind] = dist_index(gen); + } + } + + TensorType compute_target(const TensorShape &input_shape, + DataType data_type, + int axis, + const TensorShape indices_shape) + { + // Create tensors + TensorType src = create_tensor<TensorType>(input_shape, data_type); + TensorType indices_tensor = create_tensor<TensorType>(indices_shape, DataType::U32); + const uint32_t actual_axis = wrap_around(axis, static_cast<int>(input_shape.num_dimensions())); + TensorShape output_shape = arm_compute::misc::shape_calculator::compute_gather_shape(input_shape, indices_shape, actual_axis); + TensorType dst = create_tensor<TensorType>(output_shape, data_type); + + // Create and configure function + FunctionType gather; + gather.configure(&src, &indices_tensor, &dst, axis); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(indices_tensor.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + indices_tensor.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!indices_tensor.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src)); + generate_indices(AccessorType(indices_tensor), input_shape, actual_axis, indices_shape); + + // Compute function + gather.run(); + + return dst; + } + + SimpleTensor<T> compute_reference(const TensorShape &input_shape, + DataType data_type, + int axis, + const TensorShape indices_shape) + { + // Create reference tensor + SimpleTensor<T> src{ input_shape, data_type }; + SimpleTensor<uint32_t> indices_tensor{ indices_shape, DataType::U32 }; + const uint32_t actual_axis = wrap_around(axis, static_cast<int>(input_shape.num_dimensions())); + + // Fill reference tensor + fill(src); + generate_indices(indices_tensor, input_shape, actual_axis, indices_shape); + + return reference::gather(src, indices_tensor, actual_axis); + } + + TensorType _target{}; + SimpleTensor<T> _reference{}; +}; + +} // namespace validation +} // namespace test +} // namespace arm_compute + +#endif /* ARM_COMPUTE_TEST_GATHER_FIXTURE */ diff --git a/tests/validation/reference/Gather.cpp b/tests/validation/reference/Gather.cpp new file mode 100644 index 0000000000..ab5ea2f92e --- /dev/null +++ b/tests/validation/reference/Gather.cpp @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2018-2019 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 "Gather.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 <typename T> +SimpleTensor<T> gather(const SimpleTensor<T> &src, const SimpleTensor<uint32_t> &indices, uint32_t actual_axis) +{ + const auto *indices_ptr = static_cast<const uint32_t *>(indices.data()); + const TensorShape dst_shape = arm_compute::misc::shape_calculator::compute_gather_shape(src.shape(), indices.shape(), actual_axis); + SimpleTensor<T> dst(dst_shape, src.data_type()); + + Window win; + win.use_tensor_dimensions(dst_shape); + execute_window_loop(win, [&](const Coordinates & id) + { + Coordinates offset; + for(unsigned int dim = 0; dim < id.num_dimensions(); ++dim) + { + if(dim == actual_axis) + { + offset.set(dim, indices_ptr[id[dim]]); + } + else + { + offset.set(dim, id[dim]); + } + } + *reinterpret_cast<T *>(dst(id)) = *reinterpret_cast<const T *>(src(offset)); + }); + + return dst; +} + +template SimpleTensor<float> gather(const SimpleTensor<float> &src, const SimpleTensor<uint32_t> &indices, uint32_t actual_axis); +template SimpleTensor<half> gather(const SimpleTensor<half> &src, const SimpleTensor<uint32_t> &indices, uint32_t actual_axis); +template SimpleTensor<uint16_t> gather(const SimpleTensor<uint16_t> &src, const SimpleTensor<uint32_t> &indices, uint32_t actual_axis); +template SimpleTensor<uint8_t> gather(const SimpleTensor<uint8_t> &src, const SimpleTensor<uint32_t> &indices, uint32_t actual_axis); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute
\ No newline at end of file diff --git a/tests/validation/reference/Gather.h b/tests/validation/reference/Gather.h new file mode 100644 index 0000000000..54e1cb8696 --- /dev/null +++ b/tests/validation/reference/Gather.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2018-2019 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_GATHER_H__ +#define __ARM_COMPUTE_TEST_GATHER_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 +{ +template <typename T> +SimpleTensor<T> gather(const SimpleTensor<T> &src, const SimpleTensor<uint32_t> &indices, uint32_t actual_axis); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute + +#endif /* __ARM_COMPUTE_TEST_GATHER_H__ */ |