diff options
| author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-03-14 11:55:03 +0000 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-03-15 15:24:44 +0000 |
| commit | 65d30965eef7e8534fc16ea4ded413c42a81c362 (patch) | |
| tree | 3ed591e57ee4bd68f98fce0d2b47aa0e621f2973 /src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp | |
| parent | 222c753ba83bec5dc915f01d999ff76826ec45d0 (diff) | |
| download | armnn-65d30965eef7e8534fc16ea4ded413c42a81c362.tar.gz | |
IVGCVSW-2354 Caffe SqueezeNet through armnn Cl and Neon
* Compute Softmax Acl axis for Cl and Neon
* Add unittests for Softmax in 3D and 4D
* Correct input and output layer names in CaffeSqueezeNet inference test
Change-Id: I2d369d9a2db19c40f2af3341039dd33f0c5637b1
Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Diffstat (limited to 'src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp')
| -rw-r--r-- | src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp index bb56802ba3..c78ab039ef 100644 --- a/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp +++ b/src/backends/cl/workloads/ClSoftmaxFloatWorkload.cpp @@ -4,11 +4,12 @@ // #include "ClSoftmaxFloatWorkload.hpp" +#include "ClWorkloadUtils.hpp" + +#include <aclCommon/ArmComputeUtils.hpp> #include <cl/ClTensorHandle.hpp> #include <backendsCommon/CpuTensorHandle.hpp> -#include "ClWorkloadUtils.hpp" - namespace armnn { @@ -21,7 +22,9 @@ ClSoftmaxFloatWorkload::ClSoftmaxFloatWorkload(const SoftmaxQueueDescriptor& des 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(); - m_SoftmaxLayer.configure(&input, &output, m_Data.m_Parameters.m_Beta); + + unsigned int aclAxis = ComputeSoftmaxAclAxis(info.m_InputTensorInfos[0]); + m_SoftmaxLayer.configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis); } void ClSoftmaxFloatWorkload::Execute() const |