diff options
author | Matthew Sloyan <matthew.sloyan@arm.com> | 2021-05-03 12:22:03 +0100 |
---|---|---|
committer | TeresaARM <teresa.charlinreyes@arm.com> | 2021-05-20 13:57:36 +0000 |
commit | 5fc0fd6661f9647092deb052d052973a237bd52d (patch) | |
tree | f46c8ad169414ae400b22b046e25cedf7ba76c9d /src/backends/cl/workloads | |
parent | 1bed2f4f297d16f738b2c14f9e0fd24b7b03dade (diff) | |
download | armnn-5fc0fd6661f9647092deb052d052973a237bd52d.tar.gz |
MLCE-418 Reduce layer does not support multiple axes
* Added backend specific optimization to chain new reduces layers
for each axis to simulate behaviour of a layer with multiple axes.
* Added function to calculate reduced output shape.
* Added unit tests.
* Includes rework to fix IVGCVSW-5987.
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: I154b3698b5e6756b05b2a0b5a3f0896184efce72
Diffstat (limited to 'src/backends/cl/workloads')
-rw-r--r-- | src/backends/cl/workloads/ClReduceWorkload.cpp | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/backends/cl/workloads/ClReduceWorkload.cpp b/src/backends/cl/workloads/ClReduceWorkload.cpp index 6f594ff7a9..18415c4cba 100644 --- a/src/backends/cl/workloads/ClReduceWorkload.cpp +++ b/src/backends/cl/workloads/ClReduceWorkload.cpp @@ -19,24 +19,28 @@ arm_compute::Status ClReduceWorkloadValidate(const TensorInfo& input, const TensorInfo& output, const ReduceDescriptor& desc) { - const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); - const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); - if (!desc.m_vAxis.empty() && desc.m_vAxis.size() > 1) + if ( desc.m_vAxis.size()==1 || desc.m_vAxis.empty()) { - return arm_compute::Status(arm_compute::ErrorCode::RUNTIME_ERROR, - "ClReduceWorkload: Reduction is supported only on 1 axis."); - } - - arm_compute::Coordinates coords = BuildArmComputeReductionCoordinates(aclInputInfo.num_dimensions(), - input.GetNumDimensions(), - desc.m_vAxis); + const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); + const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); + arm_compute::Coordinates coords = BuildArmComputeReductionCoordinates(aclInputInfo.num_dimensions(), + input.GetNumDimensions(), + desc.m_vAxis); - return arm_compute::CLReductionOperation::validate(&aclInputInfo, - &aclOutputInfo, - static_cast<unsigned int>(coords[0]), - ConvertReductionOperationToAcl(desc), - desc.m_KeepDims); + return arm_compute::CLReductionOperation::validate(&aclInputInfo, + &aclOutputInfo, + static_cast<unsigned int>(coords[0]), + ConvertReductionOperationToAcl(desc), + desc.m_KeepDims); + } + else + { + // Validate layer if there are multiple axes. + arm_compute::Status status; + IS_MULTI_AXES_REDUCE_SUPPORTED(NeonReduceWorkloadValidate, input, desc, status); + return status; + } } ClReduceWorkload::ClReduceWorkload(const ReduceQueueDescriptor& descriptor, const WorkloadInfo& info) |