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/cl/workloads/ClSoftmaxBaseWorkload.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/cl/workloads/ClSoftmaxBaseWorkload.cpp')
-rw-r--r-- | src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp index b1dc404a6f..2f6d380f94 100644 --- a/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp +++ b/src/backends/cl/workloads/ClSoftmaxBaseWorkload.cpp @@ -6,6 +6,7 @@ #include "ClSoftmaxBaseWorkload.hpp" #include <aclCommon/ArmComputeTensorUtils.hpp> +#include <aclCommon/ArmComputeUtils.hpp> #include <arm_compute/runtime/CL/functions/CLSoftmaxLayer.h> @@ -13,12 +14,14 @@ namespace armnn { arm_compute::Status ClSoftmaxWorkloadValidate(const TensorInfo& input, - const TensorInfo& output) + const TensorInfo& output, + const SoftmaxDescriptor& descriptor) { const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input); const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output); - return arm_compute::CLSoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo); + unsigned int aclAxis = ComputeSoftmaxAclAxis(input); + return arm_compute::CLSoftmaxLayer::validate(&aclInputInfo, &aclOutputInfo, descriptor.m_Beta, aclAxis); } } |