diff options
author | SiCong Li <sicong.li@arm.com> | 2020-05-28 15:26:41 +0100 |
---|---|---|
committer | SiCong Li <sicong.li@arm.com> | 2020-06-11 09:15:33 +0000 |
commit | d004a7a707feab36e51f51cfc9eb2cb70729d5ad (patch) | |
tree | e6adef65a116e92c29303af479fab3ef5e1d8b97 /arm_compute/core/Helpers.h | |
parent | eb727f4f7afaa0a5ac5c630277086d912b128e55 (diff) | |
download | ComputeLibrary-d004a7a707feab36e51f51cfc9eb2cb70729d5ad.tar.gz |
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 <sicong.li@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3278
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/core/Helpers.h')
-rw-r--r-- | arm_compute/core/Helpers.h | 13 |
1 files changed, 13 insertions, 0 deletions
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<size_t>(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. |