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/armnn/test/CreateWorkload.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/armnn') diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index aad6244c4b..fe73550bbc 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -947,10 +947,10 @@ std::unique_ptr CreateSoftmaxWorkloadTest(armnn::IWorkloadFacto { // Create the layer we're testing. SoftmaxDescriptor softmaxDescriptor; - // Set Axis to 1 if CL or Neon until further Axes are supported. + // Set Axis to -1 if CL or Neon until further Axes are supported. if (factory.GetBackendId() == armnn::Compute::CpuAcc || factory.GetBackendId() == armnn::Compute::GpuAcc) { - softmaxDescriptor.m_Axis = 1; + softmaxDescriptor.m_Axis = -1; } Layer* const layer = graph.AddLayer(softmaxDescriptor, "layer"); @@ -1268,10 +1268,10 @@ std::unique_ptr CreateLogSoftmaxWorkloadTest(armnn::IWorkloa { // Create the layer we're testing. LogSoftmaxDescriptor logSoftmaxDescriptor; - // Set Axis to 1 if CL or Neon until further Axes are supported. + // Set Axis to -1 if CL or Neon until further Axes are supported. if (factory.GetBackendId() == armnn::Compute::CpuAcc || factory.GetBackendId() == armnn::Compute::GpuAcc) { - logSoftmaxDescriptor.m_Axis = 0; + logSoftmaxDescriptor.m_Axis = -1; } Layer* const layer = graph.AddLayer(logSoftmaxDescriptor, "layer"); -- cgit v1.2.1