From ec00da149b7884114cd6c43cc9c1cff62ddaa710 Mon Sep 17 00:00:00 2001 From: Kurtis Charnock Date: Fri, 29 Nov 2019 11:42:30 +0000 Subject: COMPMID-2728: Add support for split sizes in CLSplit Signed-off-by: Kurtis Charnock Change-Id: I69ea9e812478904c3e10379bb5943d534c45f942 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/214132 Tested-by: bsgcomp Reviewed-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/2432 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio --- tests/validation/fixtures/SplitFixture.h | 111 ++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) (limited to 'tests/validation/fixtures/SplitFixture.h') diff --git a/tests/validation/fixtures/SplitFixture.h b/tests/validation/fixtures/SplitFixture.h index 07501775e5..d2336ab2d9 100644 --- a/tests/validation/fixtures/SplitFixture.h +++ b/tests/validation/fixtures/SplitFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -145,6 +145,115 @@ protected: std::vector _target{}; std::vector> _reference{}; }; + +template +class SplitShapesFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, unsigned int axis, std::vector split_shapes, DataType data_type) + { + _target = compute_target(shape, axis, split_shapes, data_type); + _reference = compute_reference(shape, axis, split_shapes, data_type); + } + +protected: + template + void fill(U &&tensor, int i) + { + library->fill_tensor_uniform(tensor, i); + } + + std::vector compute_target(TensorShape shape, unsigned int axis, std::vector split_shapes, DataType data_type) + { + // Create tensors + TensorType src = create_tensor(shape, data_type); + std::vector dsts{}; + std::vector dsts_ptr; + + for(const auto &split_shape : split_shapes) + { + TensorType dst = create_tensor(split_shape, data_type); + dsts.push_back(std::move(dst)); + } + + for(auto &dst : dsts) + { + dsts_ptr.emplace_back(&dst); + } + + // Create and configure function + FunctionType split; + split.configure(&src, dsts_ptr, axis); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(std::all_of(dsts.cbegin(), dsts.cend(), [](const TensorType & t) + { + return t.info()->is_resizable(); + }), + framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + for(unsigned int i = 0; i < dsts.size(); ++i) + { + dsts[i].allocator()->allocate(); + } + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(std::all_of(dsts.cbegin(), dsts.cend(), [](const TensorType & t) + { + return !t.info()->is_resizable(); + }), + framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src), 0); + + // Compute function + split.run(); + + return dsts; + } + + std::vector> compute_reference(TensorShape shape, unsigned int axis, std::vector split_shapes, DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type }; + std::vector> dsts; + + // Fill reference + fill(src, 0); + + unsigned int axis_offset{ 0 }; + for(const auto &split_shape : split_shapes) + { + // Calculate splice for each split + const size_t axis_split_step = split_shape[axis]; + + // Start/End coordinates + Coordinates start_coords; + Coordinates end_coords; + for(unsigned int d = 0; d < shape.num_dimensions(); ++d) + { + end_coords.set(d, -1); + } + + // Update coordinate on axis + start_coords.set(axis, axis_offset); + end_coords.set(axis, axis_offset + axis_split_step); + + dsts.emplace_back(std::move(reference::slice(src, start_coords, end_coords))); + + axis_offset += axis_split_step; + } + + return dsts; + } + + std::vector _target{}; + std::vector> _reference{}; +}; } // namespace validation } // namespace test } // namespace arm_compute -- cgit v1.2.1