From d004a7a707feab36e51f51cfc9eb2cb70729d5ad Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Thu, 28 May 2020 15:26:41 +0100 Subject: COMPMID-3510 [Interface change] Fix definition of "axis" in NESoftmaxLayer and CLSoftmaxLayer * [Interface change] "axis" argument is renamed to "reduce_end_axis" * Unify the meaning of "axis"(now "reduce_end_axis") to be the last axis of the first n dimensions (inclusive)to reduce. This way the meaning of reduce_end_axis stays the same for both positive and negative values: it selects a dimension before which all dimensions (including the selected dimension) are reduced. Change-Id: I4ab03bd8360b1cd8cac4998df0b1571064a9d4ed Signed-off-by: SiCong Li Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3278 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- arm_compute/core/Helpers.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'arm_compute/core/Helpers.h') diff --git a/arm_compute/core/Helpers.h b/arm_compute/core/Helpers.h index 09c672ecfa..8f1426a56e 100644 --- a/arm_compute/core/Helpers.h +++ b/arm_compute/core/Helpers.h @@ -801,6 +801,19 @@ inline T wrap_around(T x, T m) return x >= 0 ? x % m : (x % m + m) % m; } +/** Convert a dimension axis to the number of dimensions in the range [0, @p dim_axis] + * Handle negative axis, negative axis is used to specify axis from the end (e.g. -1 for the last axis). + * + * @param[in] dim_axis The last axis (inclusive) in the range [0, @p dim_axis] + * @param[in] num_dims The total number of dimensions + * + * @return The number of dimensions in the range [0, @p dim_axis] + */ +inline size_t dim_index_2_num_dims(int32_t dim_axis, int32_t num_dims) +{ + return static_cast(wrap_around(dim_axis, num_dims)) + 1; +} + /** Convert negative coordinates to positive in the range [0, num_dims_input] * * @param[out] coords Array of coordinates to be converted. -- cgit v1.2.1