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/neon/workloads/NeonSoftmaxFloatWorkload.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/neon/workloads/NeonSoftmaxFloatWorkload.cpp')
-rw-r--r-- | src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp b/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp index d9c78bbd43..afc6135e0f 100644 --- a/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp +++ b/src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp @@ -7,6 +7,7 @@ #include "NeonWorkloadUtils.hpp" +#include <aclCommon/ArmComputeUtils.hpp> #include <arm_compute/runtime/NEON/functions/NESoftmaxLayer.h> namespace armnn @@ -22,8 +23,9 @@ NeonSoftmaxFloatWorkload::NeonSoftmaxFloatWorkload(const SoftmaxQueueDescriptor& arm_compute::ITensor& input = boost::polymorphic_downcast<INeonTensorHandle*>(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ITensor& output = boost::polymorphic_downcast<INeonTensorHandle*>(m_Data.m_Outputs[0])->GetTensor(); + unsigned int aclAxis = ComputeSoftmaxAclAxis(info.m_InputTensorInfos[0]); auto layer = std::make_unique<arm_compute::NESoftmaxLayer>(memoryManager); - layer->configure(&input, &output, m_Data.m_Parameters.m_Beta); + layer->configure(&input, &output, m_Data.m_Parameters.m_Beta, aclAxis); m_SoftmaxLayer.reset(layer.release()); } |