diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-06-29 16:27:03 +0100 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2020-07-01 08:26:47 +0000 |
| commit | 526647333571169076f5e72c9fb18c71025bf7c0 (patch) | |
| tree | 6dc559a7b0fae3705172b09a88fa552926652040 /src/backends/neon/workloads | |
| parent | cbd2c230b7ce5f26e2ccccf36b7ad450f6e1ad09 (diff) | |
| download | armnn-526647333571169076f5e72c9fb18c71025bf7c0.tar.gz | |
IVGCVSW-4903 Connect axis parameter in Gather from android to ACL.
!android-nn-driver:3302
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Ifbc49acb5272f8a36719bb68676e44817190537d
Diffstat (limited to 'src/backends/neon/workloads')
| -rw-r--r-- | src/backends/neon/workloads/NeonGatherWorkload.cpp | 9 | ||||
| -rw-r--r-- | src/backends/neon/workloads/NeonGatherWorkload.hpp | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/backends/neon/workloads/NeonGatherWorkload.cpp b/src/backends/neon/workloads/NeonGatherWorkload.cpp index 2e7c741781..2c94cb5184 100644 --- a/src/backends/neon/workloads/NeonGatherWorkload.cpp +++ b/src/backends/neon/workloads/NeonGatherWorkload.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -12,13 +12,14 @@ namespace armnn { arm_compute::Status NeonGatherWorkloadValidate(const TensorInfo& input, const TensorInfo& indices, - const TensorInfo& output) + const TensorInfo& output, + const GatherDescriptor& descriptor) { const arm_compute::TensorInfo aclInput = BuildArmComputeTensorInfo(input); const arm_compute::TensorInfo aclIndices = BuildArmComputeTensorInfo(indices); const arm_compute::TensorInfo aclOutput = BuildArmComputeTensorInfo(output); - int aclAxis = ComputeAclAxis(0, input); + int aclAxis = ComputeAclAxis(descriptor.m_Axis, input); return arm_compute::NEGather::validate(&aclInput, &aclIndices, &aclOutput, aclAxis); } @@ -33,7 +34,7 @@ NeonGatherWorkload::NeonGatherWorkload(const GatherQueueDescriptor& descriptor, arm_compute::ITensor& indices = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Inputs[1])->GetTensor(); arm_compute::ITensor& output = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); - int aclAxis = ComputeAclAxis(0, info.m_InputTensorInfos[0]); + int aclAxis = ComputeAclAxis(descriptor.m_Parameters.m_Axis, info.m_InputTensorInfos[0]); m_Layer.configure(&input, &indices, &output, aclAxis); } diff --git a/src/backends/neon/workloads/NeonGatherWorkload.hpp b/src/backends/neon/workloads/NeonGatherWorkload.hpp index b1b47a5069..e5b7b57629 100644 --- a/src/backends/neon/workloads/NeonGatherWorkload.hpp +++ b/src/backends/neon/workloads/NeonGatherWorkload.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -13,7 +13,8 @@ namespace armnn { arm_compute::Status NeonGatherWorkloadValidate(const TensorInfo& input, const TensorInfo& indices, - const TensorInfo& output); + const TensorInfo& output, + const GatherDescriptor& descriptor); class NeonGatherWorkload : public BaseWorkload<GatherQueueDescriptor> { |