diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-07-28 15:17:12 +0100 |
|---|---|---|
| committer | Jim Flynn <jim.flynn@arm.com> | 2020-07-29 15:45:21 +0000 |
| commit | 7ac3ca67b8b38049ff373c35cdcba18c1d358a46 (patch) | |
| tree | c6616dfe206f7c827142732805402eb3f609adc1 /src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp | |
| parent | bbfe603e5ae42317a2b67d713d00882bea341c88 (diff) | |
| download | armnn-7ac3ca67b8b38049ff373c35cdcba18c1d358a46.tar.gz | |
IVGCVSW-5167 Use a generic axis in CL/Neon LogSoftmax and Softmax workload
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: Id72d2c2851adcc1dd8f00a6103642b16ebe3a964
Diffstat (limited to 'src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp')
| -rw-r--r-- | src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp b/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp index bd14d514d2..c62c9d24f6 100644 --- a/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp +++ b/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp @@ -21,7 +21,8 @@ arm_compute::Status ClLogSoftmaxWorkloadValidate(const TensorInfo& input, const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); - unsigned int aclAxis = ComputeSoftmaxAclAxis<unsigned int>(descriptor, input); + int aclAxis_int = ComputeAclAxis(descriptor.m_Axis, input); + unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, input); return arm_compute::CLLogSoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis); } @@ -35,7 +36,8 @@ ClLogSoftmaxWorkload::ClLogSoftmaxWorkload(const LogSoftmaxQueueDescriptor& desc arm_compute::ICLTensor& input = static_cast<ClTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ICLTensor& output = static_cast<ClTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); - unsigned int aclAxis = ComputeSoftmaxAclAxis<unsigned int>(m_Data.m_Parameters, info.m_InputTensorInfos[0]); + int aclAxis_int = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]); + unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, info.m_InputTensorInfos[0]); m_LogSoftmaxLayer.configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis); } |