From 9cf7f88f5923dd1ba5d159ade85fcc20185c323f Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Fri, 7 Aug 2020 16:00:38 +0100 Subject: 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 Change-Id: I4be83f60aa9505b4bf2367c4489e6f12d644c6d4 --- src/backends/neon/workloads/NeonLogSoftmaxWorkload.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/backends/neon/workloads/NeonLogSoftmaxWorkload.cpp') diff --git a/src/backends/neon/workloads/NeonLogSoftmaxWorkload.cpp b/src/backends/neon/workloads/NeonLogSoftmaxWorkload.cpp index 9c8ab072c5..39ff279728 100644 --- a/src/backends/neon/workloads/NeonLogSoftmaxWorkload.cpp +++ b/src/backends/neon/workloads/NeonLogSoftmaxWorkload.cpp @@ -23,8 +23,12 @@ arm_compute::Status NeonLogSoftmaxWorkloadValidate(const TensorInfo& input, 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::NELogSoftmaxLayer::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::NELogSoftmaxLayer::validate(&aclInputInfo, + &aclOutputInfo, + descriptor.m_Beta, + static_cast(aclAxis)); } NeonLogSoftmaxWorkload::NeonLogSoftmaxWorkload(const LogSoftmaxQueueDescriptor& descriptor, @@ -38,8 +42,9 @@ NeonLogSoftmaxWorkload::NeonLogSoftmaxWorkload(const LogSoftmaxQueueDescriptor& arm_compute::ITensor& output = PolymorphicDowncast(m_Data.m_Outputs[0])->GetTensor(); auto layer = std::make_unique(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(aclAxis)); m_LogSoftmaxLayer.reset(layer.release()); } -- cgit v1.2.1