diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2019-07-26 15:44:17 +0100 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2019-07-26 15:44:17 +0100 |
commit | 3b9383548309a8f9121668826a628ec250c57a1c (patch) | |
tree | 01cc4e162008aea23bfe9ae167ded0e8f9abc39c /src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp | |
parent | 82b15eda6f87a20bc31256f5e85eb4082d3d0591 (diff) | |
download | armnn-3b9383548309a8f9121668826a628ec250c57a1c.tar.gz |
IVGCVSW-3554 Update workloads to pass Softmax Axis Parameter to Backends
* Add check in CL and Neon to ensure axis is 1 otherwise
return unsupported.
* Edit CreateWorkload test and JsonPrinter test to ensure axis of 1.
Change-Id: I499b405532e26fefc2dd1c18b6dc6005813b5604
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Diffstat (limited to 'src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp')
-rw-r--r-- | src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp b/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp index b229bc48a2..8acb775344 100644 --- a/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp +++ b/src/backends/neon/workloads/NeonSoftmaxBaseWorkload.cpp @@ -6,6 +6,7 @@ #include "NeonSoftmaxBaseWorkload.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> #include <arm_compute/runtime/NEON/functions/NESoftmaxLayer.h> @@ -19,7 +20,8 @@ arm_compute::Status NeonSoftmaxWorkloadValidate(const TensorInfo& input, const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); - return arm_compute::NESoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta); + unsigned int aclAxis = ComputeSoftmaxAclAxis(input); + return arm_compute::NESoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis); } } //namespace armnn |