From 7ac3ca67b8b38049ff373c35cdcba18c1d358a46 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Tue, 28 Jul 2020 15:17:12 +0100 Subject: IVGCVSW-5167 Use a generic axis in CL/Neon LogSoftmax and Softmax workload Signed-off-by: Teresa Charlin Change-Id: Id72d2c2851adcc1dd8f00a6103642b16ebe3a964 --- src/backends/aclCommon/ArmComputeUtils.hpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'src/backends/aclCommon/ArmComputeUtils.hpp') diff --git a/src/backends/aclCommon/ArmComputeUtils.hpp b/src/backends/aclCommon/ArmComputeUtils.hpp index eae152dc20..6b1f975350 100644 --- a/src/backends/aclCommon/ArmComputeUtils.hpp +++ b/src/backends/aclCommon/ArmComputeUtils.hpp @@ -189,19 +189,33 @@ inline std::set ComputeSplitAxis(const armnn::SplitterDescriptor& return splitAxis; } -/// Function to convert ArmNN axis (left to right) to ACL axis (right to left) ranging from [-dim, dim) +/// Function to convert ArmNN axis (left to right) to ACL axis (right to left) ranging from [-rank, rank) inline int ComputeAclAxis(const int& armnnAxis, const armnn::TensorInfo& tensor) { - int dim = static_cast(tensor.GetNumDimensions()); + int rank = static_cast(tensor.GetNumDimensions()); - ARMNN_ASSERT(dim != 0); - ARMNN_ASSERT((-1 * dim) <= armnnAxis); - ARMNN_ASSERT(armnnAxis < dim); + ARMNN_ASSERT(rank != 0); + ARMNN_ASSERT((-1 * rank) <= armnnAxis); + ARMNN_ASSERT(armnnAxis < rank); int sign = (armnnAxis < 0) ? -1 : 1; - int aclAxis = sign * dim - 1 - armnnAxis; + int aclAxis = sign * rank - 1 - armnnAxis; return aclAxis; } +/// Function to convert axis to its positive equivalent value. +/// [-rank, rank) --> [0, rank) +inline unsigned int ComputePositiveAxis(const int& axis, const armnn::TensorInfo& tensor) +{ + int rank = static_cast(tensor.GetNumDimensions()); + + ARMNN_ASSERT(rank != 0); + ARMNN_ASSERT((-1 * rank) <= axis); + ARMNN_ASSERT(axis < rank); + + int positiveAxis = (axis < 0) ? rank + axis : axis; + return static_cast(positiveAxis); +} + } // namespace armnn -- cgit v1.2.1