diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-08-28 15:13:05 +0100 |
---|---|---|
committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2020-09-03 15:33:57 +0000 |
commit | e386676035e56a8354c4c5fc1be5f070f8e666e4 (patch) | |
tree | 27155c77508d865dacc1adcacb007a1f98e6e9f8 /src/backends/cl | |
parent | 9e9c7f5067c287b9989ee49d34825809d7f611dd (diff) | |
download | armnn-e386676035e56a8354c4c5fc1be5f070f8e666e4.tar.gz |
Update ACL pin to ec4dee8c68a3d0f6d63db184bfb2f4589429778e
* Axis for LogSoftMax and SoftMax can be either positive or negative
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I36b0507ad7600c0a98c3b8be3c0350045ee05b84
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Diffstat (limited to 'src/backends/cl')
-rw-r--r-- | src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp | 6 | ||||
-rw-r--r-- | src/backends/cl/workloads/ClSoftmaxWorkload.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp b/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp index c62c9d24f6..6d53523291 100644 --- a/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp +++ b/src/backends/cl/workloads/ClLogSoftmaxWorkload.cpp @@ -21,8 +21,7 @@ arm_compute::Status ClLogSoftmaxWorkloadValidate(const TensorInfo& input, const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); - int aclAxis_int = ComputeAclAxis(descriptor.m_Axis, input); - unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, input); + int aclAxis = ComputeAclAxis(descriptor.m_Axis, input); return arm_compute::CLLogSoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis); } @@ -36,8 +35,7 @@ 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(); - int aclAxis_int = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]); - unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, info.m_InputTensorInfos[0]); + int aclAxis = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]); m_LogSoftmaxLayer.configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis); } diff --git a/src/backends/cl/workloads/ClSoftmaxWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxWorkload.cpp index 37746c83a6..8bc2a765ed 100644 --- a/src/backends/cl/workloads/ClSoftmaxWorkload.cpp +++ b/src/backends/cl/workloads/ClSoftmaxWorkload.cpp @@ -21,8 +21,7 @@ arm_compute::Status ClSoftmaxWorkloadValidate(const TensorInfo& input, const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); - int aclAxis_int = ComputeAclAxis(descriptor.m_Axis, input); - unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, input); + int aclAxis = ComputeAclAxis(descriptor.m_Axis, input); return arm_compute::CLSoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis); } @@ -36,8 +35,7 @@ ClSoftmaxWorkload::ClSoftmaxWorkload(const SoftmaxQueueDescriptor& descriptor, c 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(); - int aclAxis_int = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]); - unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, info.m_InputTensorInfos[0]); + int aclAxis = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]); m_SoftmaxLayer.configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis); } |