diff options
author | Colm Donelan <Colm.Donelan@arm.com> | 2019-08-15 16:03:17 +0100 |
---|---|---|
committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-08-16 15:23:24 +0000 |
commit | c3c5fc259c0bfcab9f0096b7b68fc13b0937296a (patch) | |
tree | 0a2e54b66828bc788186d13b006945b14dcae8fc /src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp | |
parent | dba634fd6a66a9e033a1925b0b26c80b270bbf21 (diff) | |
download | armnn-c3c5fc259c0bfcab9f0096b7b68fc13b0937296a.tar.gz |
IVGCVSW-3620 Fix Hal 1.2 Softmax test failures on GpuAcc and CpuAcc
The following NeuralNetworkTests tests were failing on GpuAcc and CpuAcc:
GeneratedTests.softmax_v1_2_relaxed
GeneratedTests.softmax_v1_2_quant8
GeneratedTests.softmax_v1_2_2
GeneratedTests.softmax_v1_2_relaxed_2
GeneratedTests.softmax_v1_2_quant8_2
The default value for Softmax axis parameter in Android is -1 but is 1 in ACL.
Detect and handle this in ArmComputeUtils.ComputeSoftmaxAclAxis.
Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: Ibb0660e4cb0dc6bd4c804c4397fbd61f38acdd9c
Diffstat (limited to 'src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp')
-rw-r--r-- | src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp b/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp index 4dc913134c..152d19cc04 100644 --- a/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp @@ -24,7 +24,7 @@ NeonSoftmaxFloatWorkload::NeonSoftmaxFloatWorkload(const SoftmaxQueueDescriptor& arm_compute::ITensor& output = boost::polymorphic_downcast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); auto layer = std::make_unique<arm_compute::NESoftmaxLayer>(memoryManager); - unsigned int aclAxis = ComputeSoftmaxAclAxis(info.m_InputTensorInfos[0]); + unsigned int aclAxis = ComputeSoftmaxAclAxis(m_Data.m_Parameters, info.m_InputTensorInfos[0]); layer->configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis); m_SoftmaxLayer.reset(layer.release()); } |