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 --- src/runtime/CL/functions/CLSplit.cpp | 96 +----------------------------------- 1 file changed, 1 insertion(+), 95 deletions(-) (limited to 'src/runtime/CL/functions/CLSplit.cpp') diff --git a/src/runtime/CL/functions/CLSplit.cpp b/src/runtime/CL/functions/CLSplit.cpp index 8d37d538c8..9fca52bfd2 100644 --- a/src/runtime/CL/functions/CLSplit.cpp +++ b/src/runtime/CL/functions/CLSplit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -34,100 +34,6 @@ namespace arm_compute { -CLSplit::CLSplit() - : _outputs_vector(), _slice_functions(), _num_outputs(0) -{ -} - -void CLSplit::configure(const ICLTensor *input, const std::vector &outputs, unsigned int axis) -{ - // Create Slice functions - _num_outputs = outputs.size(); - _slice_functions.resize(_num_outputs); - - // Get output shape - const TensorShape output_shape = arm_compute::misc::shape_calculator::compute_split_shape(input->info(), axis, _num_outputs); - - // Extract output tensor info - std::vector outputs_info; - for(auto &output : outputs) - { - ARM_COMPUTE_ERROR_ON_NULLPTR(output); - outputs_info.emplace_back(output->info()); - } - - // Validate - ARM_COMPUTE_ERROR_THROW_ON(CLSplit::validate(input->info(), outputs_info, axis)); - - const size_t axis_split_step = output_shape[axis]; - unsigned int axis_offset = 0; - - // Start/End coordinates - Coordinates start_coords; - Coordinates end_coords; - for(unsigned int d = 0; d < output_shape.num_dimensions(); ++d) - { - end_coords.set(d, -1); - } - - for(unsigned int i = 0; i < _num_outputs; i++) - { - // Update coordinate on axis - start_coords.set(axis, axis_offset); - end_coords.set(axis, axis_offset + axis_split_step); - - // Configure slice function - _slice_functions[i].configure(input, outputs[i], start_coords, end_coords); - - // Set valid region from shape - outputs[i]->info()->set_valid_region(ValidRegion(Coordinates(), output_shape)); - - // Update axis offset - axis_offset += axis_split_step; - } -} - -Status CLSplit::validate(const ITensorInfo *input, const std::vector &outputs, unsigned int axis) -{ - ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input); - ARM_COMPUTE_RETURN_ERROR_ON(axis >= input->num_dimensions()); - ARM_COMPUTE_RETURN_ERROR_ON(outputs.size() < 2); - - // Get output shape - const TensorShape output_shape = arm_compute::misc::shape_calculator::compute_split_shape(input, axis, outputs.size()); - ARM_COMPUTE_RETURN_ERROR_ON(output_shape.total_size() == 0); - - const size_t axis_split_step = output_shape[axis]; - unsigned int axis_offset = 0; - - // Start/End coordinates - Coordinates start_coords; - Coordinates end_coords; - for(unsigned int d = 0; d < output_shape.num_dimensions(); ++d) - { - end_coords.set(d, -1); - } - - // Validate output tensors - for(const auto &output : outputs) - { - ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(output); - - // Output auto inizialitation if not yet initialized - TensorInfo tmp_output_info = *output->clone(); - auto_init_if_empty(tmp_output_info, input->clone()->set_is_resizable(true).set_tensor_shape(output_shape)); - - // Update coordinate on axis - start_coords.set(axis, axis_offset); - end_coords.set(axis, axis_offset + axis_split_step); - - ARM_COMPUTE_RETURN_ON_ERROR(CLSlice::validate(input, output, start_coords, end_coords)); - axis_offset += axis_split_step; - } - - return Status{}; -} - void CLSplit::run() { cl::CommandQueue q = CLScheduler::get().queue(); -- cgit v1.2.1