diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2018-10-24 14:01:04 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:55:45 +0000 |
| commit | 96f8461e50745f659b8ebbe37a3d051e06ffec2c (patch) | |
| tree | 71fabf2237b3c4fd7a249ca5b43c41a7d889c5c2 /src/runtime/CL/functions/CLReduceMean.cpp | |
| parent | a1422fbf985c89ffebc8f5af8093e9cd987cfe29 (diff) | |
| download | ComputeLibrary-96f8461e50745f659b8ebbe37a3d051e06ffec2c.tar.gz | |
COMPMID-1451 Properly remove dimensions in CLReduceMean
Change-Id: I7bd4a8ce81483ba56686b765ca3caabebe42882d
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/155000
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'src/runtime/CL/functions/CLReduceMean.cpp')
| -rw-r--r-- | src/runtime/CL/functions/CLReduceMean.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/runtime/CL/functions/CLReduceMean.cpp b/src/runtime/CL/functions/CLReduceMean.cpp index 6e55b81d1c..02e341a35c 100644 --- a/src/runtime/CL/functions/CLReduceMean.cpp +++ b/src/runtime/CL/functions/CLReduceMean.cpp @@ -74,9 +74,14 @@ void CLReduceMean::configure(ICLTensor *input, const Coordinates &reduction_axis if(!keep_dims) { TensorShape out_shape = input->info()->tensor_shape(); + + // We have to sort the reduction axis vectors in order for remove_dimension + // to work properly + Coordinates axis_copy = reduction_axis; + std::sort(axis_copy.begin(), axis_copy.begin() + _reduction_ops); for(unsigned int i = 0; i < _reduction_ops; ++i) { - out_shape.remove_dimension(reduction_axis[i]); + out_shape.remove_dimension(axis_copy[i] - i); } auto_init_if_empty(*output->info(), input->info()->clone()->set_tensor_shape(out_shape)); _reshape.configure(_reduced_outs.get() + _reduction_ops - 1, output); @@ -92,10 +97,10 @@ Status CLReduceMean::validate(const ITensorInfo *input, const Coordinates &reduc for(unsigned int i = 0; i < reduction_axis.num_dimensions(); ++i) { ARM_COMPUTE_RETURN_ERROR_ON(reduction_axis[i] > 3); - if(output->total_size() > 0) + ARM_COMPUTE_RETURN_ERROR_ON(static_cast<unsigned int>(reduction_axis[i]) > input->num_dimensions() - 1); + if(output->total_size() > 0 && keep_dims) { ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(reduction_axis[i]) != 1); - ARM_COMPUTE_RETURN_ERROR_ON(static_cast<unsigned int>(reduction_axis[i]) > input->num_dimensions() - 1); } ARM_COMPUTE_RETURN_ON_ERROR(CLReductionOperationKernel::validate(input, output, reduction_axis[i], ReductionOperation::MEAN_SUM, 0)); |