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 /tests/validation/reference/LogSoftmaxLayer.cpp | |
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 'tests/validation/reference/LogSoftmaxLayer.cpp')
-rw-r--r-- | tests/validation/reference/LogSoftmaxLayer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/validation/reference/LogSoftmaxLayer.cpp b/tests/validation/reference/LogSoftmaxLayer.cpp index edb208e6ae..8dd8d45a86 100644 --- a/tests/validation/reference/LogSoftmaxLayer.cpp +++ b/tests/validation/reference/LogSoftmaxLayer.cpp @@ -35,26 +35,26 @@ namespace validation namespace reference { template <typename T, typename std::enable_if<is_floating_point<T>::value, int>::type> -SimpleTensor<T> log_softmax_layer(const SimpleTensor<T> &src, float beta, int32_t axis) +SimpleTensor<T> log_softmax_layer(const SimpleTensor<T> &src, float beta, int32_t reduce_end_axis) { - return softmax_layer_generic<T>(src, beta, axis, true); + return softmax_layer_generic<T>(src, beta, reduce_end_axis, true); } 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> log_softmax_layer(const SimpleTensor<T> &src, float beta, int32_t axis) +SimpleTensor<T> log_softmax_layer(const SimpleTensor<T> &src, float beta, int32_t reduce_end_axis) { const QuantizationInfo output_quantization_info = arm_compute::get_softmax_output_quantization_info(src.data_type(), true); SimpleTensor<float> src_tmp = convert_from_asymmetric(src); - SimpleTensor<float> dst_tmp = log_softmax_layer<float>(src_tmp, beta, axis); + SimpleTensor<float> dst_tmp = log_softmax_layer<float>(src_tmp, beta, reduce_end_axis); SimpleTensor<T> dst = convert_to_asymmetric<T>(dst_tmp, output_quantization_info); return dst; } -template SimpleTensor<float> log_softmax_layer(const SimpleTensor<float> &src, float beta, int32_t axis); -template SimpleTensor<half> log_softmax_layer(const SimpleTensor<half> &src, float beta, int32_t axis); -template SimpleTensor<uint8_t> log_softmax_layer(const SimpleTensor<uint8_t> &src, float beta, int32_t axis); -template SimpleTensor<int8_t> log_softmax_layer(const SimpleTensor<int8_t> &src, float beta, int32_t axis); +template SimpleTensor<float> log_softmax_layer(const SimpleTensor<float> &src, float beta, int32_t reduce_end_axis); +template SimpleTensor<half> log_softmax_layer(const SimpleTensor<half> &src, float beta, int32_t reduce_end_axis); +template SimpleTensor<uint8_t> log_softmax_layer(const SimpleTensor<uint8_t> &src, float beta, int32_t reduce_end_axis); +template SimpleTensor<int8_t> log_softmax_layer(const SimpleTensor<int8_t> &src, float beta, int32_t reduce_end_axis); } // namespace reference } // namespace validation } // namespace test |