COMPMID-2727: Add support for split sizes in NESplit
Signed-off-by: Kurtis Charnock <kurtis.charnock@arm.com>
Change-Id: I14cb2711f3a02bd5f50976cb78fe5865e2062891
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/c/VisualCompute/ComputeLibrary/+/214133
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2433
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/src/runtime/NEON/functions/NESplit.cpp b/src/runtime/NEON/functions/NESplit.cpp
index 0373ab6..d512fe5 100644
--- a/src/runtime/NEON/functions/NESplit.cpp
+++ b/src/runtime/NEON/functions/NESplit.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
{
-NESplit::NESplit()
- : _outputs_vector(), _slice_functions(), _num_outputs(0)
-{
-}
-
-void NESplit::configure(const ITensor *input, const std::vector<ITensor *> &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<ITensorInfo *> outputs_info;
- for(auto &output : outputs)
- {
- ARM_COMPUTE_ERROR_ON_NULLPTR(output);
- outputs_info.emplace_back(output->info());
- }
-
- // Validate
- ARM_COMPUTE_ERROR_THROW_ON(NESplit::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 NESplit::validate(const ITensorInfo *input, const std::vector<ITensorInfo *> &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(NESlice::validate(input, output, start_coords, end_coords));
- axis_offset += axis_split_step;
- }
-
- return Status{};
-}
-
void NESplit::run()
{
for(unsigned i = 0; i < _num_outputs; ++i)