commit 9cf7f88f5923dd1ba5d159ade85fcc20185c323f
author Teresa Charlin <teresa.charlinreyes@arm.com> Fri Aug 07 16:00:38 2020 +0100
committer TeresaARM <teresa.charlinreyes@arm.com> Mon Aug 10 10:49:31 2020 +0000
tree 245b89961e45a3ee4309fafef681639d1635e2c7
parent 76615a5edd55b890acdd5fb078d9242e1e719a45

Update ACL pin to 4aed4aafa2ddb0b6f4b76aef5008c8bb45599ea4

 * Use axis=-1 in all softmax tests as ACL only accepts this dimension
   (the most right dimension, in ACL is 0 and in ArmNN is -1).

Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I4be83f60aa9505b4bf2367c4489e6f12d644c6d4

src/backends/neon/workloads/NeonSoftmaxWorkload.cpp

diff --git a/src/backends/neon/workloads/NeonSoftmaxWorkload.cpp b/src/backends/neon/workloads/NeonSoftmaxWorkload.cpp
index 37e7bfb..7e1501f 100644
--- a/src/backends/neon/workloads/NeonSoftmaxWorkload.cpp
+++ b/src/backends/neon/workloads/NeonSoftmaxWorkload.cpp
@@ -23,8 +23,12 @@
     const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input);
     const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output);
 
-    int aclAxis = ComputeAclAxis(descriptor.m_Axis, input);
-    return arm_compute::NESoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis);
+    int aclAxis_int = ComputeAclAxis(descriptor.m_Axis, input);
+    unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, input);
+    return arm_compute::NESoftmaxLayer::validate(&aclInputInfo,
+                                                 &aclOutputInfo,
+                                                 descriptor.m_Beta,
+                                                 static_cast<int>(aclAxis));
 }
 
 NeonSoftmaxWorkload::NeonSoftmaxWorkload(const SoftmaxQueueDescriptor& descriptor,
@@ -38,8 +42,9 @@
     arm_compute::ITensor& output = PolymorphicDowncast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
 
     auto layer = std::make_unique<arm_compute::NESoftmaxLayer>(memoryManager);
-    int aclAxis = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]);
-    layer->configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis);
+    int aclAxis_int = ComputeAclAxis(m_Data.m_Parameters.m_Axis, info.m_InputTensorInfos[0]);
+    unsigned int aclAxis = ComputePositiveAxis(aclAxis_int, info.m_InputTensorInfos[0]);
+    layer->configure(&input, &output, m_Data.m_Parameters.m_Beta, static_cast<int>(aclAxis));
     m_SoftmaxLayer.reset(layer.release());
 }