diff options
author | Sheri Zhang <sheri.zhang@arm.com> | 2020-05-05 11:47:36 +0100 |
---|---|---|
committer | Sheri Zhang <sheri.zhang@arm.com> | 2020-05-12 13:12:58 +0000 |
commit | 1f567afcdfb2919fab417f0060155deda7132df8 (patch) | |
tree | 79631c4b121b89ff261156c41d1cc217afd891fc /tests/validation/reference/SoftmaxLayer.cpp | |
parent | c630e94d143ac5f46381f53a4994b29ea7ef2ac0 (diff) | |
download | ComputeLibrary-1f567afcdfb2919fab417f0060155deda7132df8.tar.gz |
COMPMID-3442: Add support of negative axis in NESoftmaxLayer and reference code
Signed-off-by: Sheri Zhang <sheri.zhang@arm.com>
Change-Id: I285cc3b74ac0a45f0ad5830baed5237cea568f15
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3147
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/reference/SoftmaxLayer.cpp')
-rw-r--r-- | tests/validation/reference/SoftmaxLayer.cpp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/tests/validation/reference/SoftmaxLayer.cpp b/tests/validation/reference/SoftmaxLayer.cpp index ee7a5f175a..2fe1faef50 100644 --- a/tests/validation/reference/SoftmaxLayer.cpp +++ b/tests/validation/reference/SoftmaxLayer.cpp @@ -34,23 +34,29 @@ namespace validation namespace reference { template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type> -SimpleTensor<T> softmax_layer_generic(const SimpleTensor<T> &src, float beta, size_t axis, bool is_log) +SimpleTensor<T> softmax_layer_generic(const SimpleTensor<T> &src, float beta, int32_t axis, bool is_log) { // Create reference SimpleTensor<T> dst{ src.shape(), src.data_type(), 1 }; + // Negative index is used to specify axis from the end (e.g. -1 for the last axis). + if(axis < 0) + { + axis += src.shape().num_dimensions(); + } + // Compute reference. Lower dims are the collapsing of the first axis // dimensions (i.e., the flattened dimension of each batch). The upper dims are // instead the batches we want to normalize int lower_dims = 1; - for(size_t i = 0; i < axis; i++) + for(size_t i = 0; i < static_cast<size_t>(axis); ++i) { lower_dims *= src.shape()[i]; } int upper_dims = 1; - for(size_t i = axis; i < TensorShape::num_max_dimensions; i++) + for(size_t i = static_cast<size_t>(axis); i < TensorShape::num_max_dimensions; ++i) { upper_dims *= src.shape()[i]; } @@ -101,17 +107,17 @@ SimpleTensor<T> softmax_layer_generic(const SimpleTensor<T> &src, float beta, si return dst; } -template SimpleTensor<float> softmax_layer_generic(const SimpleTensor<float> &src, float beta, size_t axis, bool is_log); -template SimpleTensor<half> softmax_layer_generic(const SimpleTensor<half> &src, float beta, size_t axis, bool is_log); +template SimpleTensor<float> softmax_layer_generic(const SimpleTensor<float> &src, float beta, int32_t axis, bool is_log); +template SimpleTensor<half> softmax_layer_generic(const SimpleTensor<half> &src, float beta, int32_t axis, bool is_log); template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type> -SimpleTensor<T> softmax_layer(const SimpleTensor<T> &src, float beta, size_t axis) +SimpleTensor<T> softmax_layer(const SimpleTensor<T> &src, float beta, int32_t axis) { return softmax_layer_generic<T>(src, beta, axis, false); } template < typename T, typename std::enable_if < std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value, int >::type > -SimpleTensor<T> softmax_layer(const SimpleTensor<T> &src, float beta, size_t axis) +SimpleTensor<T> softmax_layer(const SimpleTensor<T> &src, float beta, int32_t axis) { const QuantizationInfo output_quantization_info = arm_compute::get_softmax_output_quantization_info(src.data_type(), false); @@ -121,10 +127,10 @@ SimpleTensor<T> softmax_layer(const SimpleTensor<T> &src, float beta, size_t axi return dst; } -template SimpleTensor<float> softmax_layer(const SimpleTensor<float> &src, float beta, size_t axis); -template SimpleTensor<half> softmax_layer(const SimpleTensor<half> &src, float beta, size_t axis); -template SimpleTensor<uint8_t> softmax_layer(const SimpleTensor<uint8_t> &src, float beta, size_t axis); -template SimpleTensor<int8_t> softmax_layer(const SimpleTensor<int8_t> &src, float beta, size_t axis); +template SimpleTensor<float> softmax_layer(const SimpleTensor<float> &src, float beta, int32_t axis); +template SimpleTensor<half> softmax_layer(const SimpleTensor<half> &src, float beta, int32_t axis); +template SimpleTensor<uint8_t> softmax_layer(const SimpleTensor<uint8_t> &src, float beta, int32_t axis); +template SimpleTensor<int8_t> softmax_layer(const SimpleTensor<int8_t> &src, float beta, int32_t axis); } // namespace reference } // namespace validation } // namespace test |