From 65d30965eef7e8534fc16ea4ded413c42a81c362 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Thu, 14 Mar 2019 11:55:03 +0000 Subject: 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 --- src/backends/neon/workloads/NeonSoftmaxFloatWorkload.cpp | 4 +++- src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/backends/neon/workloads') 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 #include namespace armnn @@ -22,8 +23,9 @@ NeonSoftmaxFloatWorkload::NeonSoftmaxFloatWorkload(const SoftmaxQueueDescriptor& arm_compute::ITensor& input = boost::polymorphic_downcast(m_Data.m_Inputs[0])->GetTensor(); arm_compute::ITensor& output = boost::polymorphic_downcast(m_Data.m_Outputs[0])->GetTensor(); + unsigned int aclAxis = ComputeSoftmaxAclAxis(info.m_InputTensorInfos[0]); auto layer = std::make_unique(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()); } diff --git a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp index f780589075..7f295d6548 100644 --- a/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp +++ b/src/backends/neon/workloads/NeonSoftmaxUint8Workload.cpp @@ -4,9 +4,10 @@ // #include "NeonSoftmaxUint8Workload.hpp" - #include "NeonWorkloadUtils.hpp" +#include + #include namespace armnn @@ -29,9 +30,10 @@ NeonSoftmaxUint8Workload::NeonSoftmaxUint8Workload(const SoftmaxQueueDescriptor& throw InvalidArgumentException( "Invalid quantization for output. Only scale = 1.0f / 256.0f and offset = 0 supported"); } + unsigned int aclAxis = ComputeSoftmaxAclAxis(info.m_InputTensorInfos[0]); auto layer = std::make_unique(memoryManager); - layer->configure(&input, &output, descriptor.m_Parameters.m_Beta); + layer->configure(&input, &output, descriptor.m_Parameters.m_Beta, aclAxis); m_SoftmaxLayer.reset(layer.release()); } -- cgit v1.2.1