From 1f567afcdfb2919fab417f0060155deda7132df8 Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Tue, 5 May 2020 11:47:36 +0100 Subject: COMPMID-3442: Add support of negative axis in NESoftmaxLayer and reference code Signed-off-by: Sheri Zhang Change-Id: I285cc3b74ac0a45f0ad5830baed5237cea568f15 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3147 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- tests/validation/NEON/SoftmaxLayer.cpp | 10 ++++----- tests/validation/fixtures/SoftmaxLayerFixture.h | 6 +++--- tests/validation/reference/LogSoftmaxLayer.cpp | 16 +++++++------- tests/validation/reference/LogSoftmaxLayer.h | 8 +++---- tests/validation/reference/SoftmaxLayer.cpp | 28 +++++++++++++++---------- tests/validation/reference/SoftmaxLayer.h | 10 ++++----- 6 files changed, 42 insertions(+), 36 deletions(-) (limited to 'tests') diff --git a/tests/validation/NEON/SoftmaxLayer.cpp b/tests/validation/NEON/SoftmaxLayer.cpp index c429782e60..8af3847cf8 100644 --- a/tests/validation/NEON/SoftmaxLayer.cpp +++ b/tests/validation/NEON/SoftmaxLayer.cpp @@ -97,9 +97,9 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( framework::dataset::make("axis", { 1, 1, 1, + -1, 1, - 1, - 0, + -3, })), framework::dataset::make("Expected", { false, false, false, true, true, false })), input_info, output_info, beta, axis, expected) @@ -188,7 +188,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall4D, NESoftmaxLayerQuantizedFixture, fram framework::dataset::make("DataType", DataType::QASYMM8)), combine(framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, -10) }), framework::dataset::make("Beta", { 1.0f, 2.f }))), - framework::dataset::make("Axis", { 1, 2, 3 }))) + framework::dataset::make("Axis", { -1, 2, 3 }))) { // Validate output validate(Accessor(_target), _reference, tolerance_qasymm8); @@ -209,7 +209,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall2D, NESoftmaxLayerQuantizedFixture, frame framework::dataset::make("DataType", DataType::QASYMM8_SIGNED)), combine(framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, -10) }), framework::dataset::make("Beta", { 1.0f, 2.f }))), - framework::dataset::make("Axis", { 1 }))) + framework::dataset::make("Axis", { -1, 1 }))) { // Validate output validate(Accessor(_target), _reference, tolerance_qasymm8_signed); @@ -218,7 +218,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall4D, NESoftmaxLayerQuantizedFixture, frame framework::dataset::make("DataType", DataType::QASYMM8_SIGNED)), combine(framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.5f, -10) }), framework::dataset::make("Beta", { 1.0f, 2.f }))), - framework::dataset::make("Axis", { 1, 2, 3 }))) + framework::dataset::make("Axis", { -2, 2, 3 }))) { // Validate output validate(Accessor(_target), _reference, tolerance_qasymm8_signed); diff --git a/tests/validation/fixtures/SoftmaxLayerFixture.h b/tests/validation/fixtures/SoftmaxLayerFixture.h index 82daf34f13..aeff777776 100644 --- a/tests/validation/fixtures/SoftmaxLayerFixture.h +++ b/tests/validation/fixtures/SoftmaxLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -73,7 +73,7 @@ protected: } TensorType compute_target(const TensorShape &shape, DataType data_type, - QuantizationInfo quantization_info, float beta, size_t axis) + QuantizationInfo quantization_info, float beta, int32_t axis) { // Create tensors TensorType src = create_tensor(shape, data_type, 1, quantization_info); @@ -103,7 +103,7 @@ protected: } SimpleTensor compute_reference(const TensorShape &shape, DataType data_type, - QuantizationInfo quantization_info, float beta, size_t axis) + QuantizationInfo quantization_info, float beta, int32_t axis) { // Create reference SimpleTensor src{ shape, data_type, 1, quantization_info }; diff --git a/tests/validation/reference/LogSoftmaxLayer.cpp b/tests/validation/reference/LogSoftmaxLayer.cpp index e4403956ab..edb208e6ae 100644 --- a/tests/validation/reference/LogSoftmaxLayer.cpp +++ b/tests/validation/reference/LogSoftmaxLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -35,13 +35,13 @@ namespace validation namespace reference { template ::value, int>::type> -SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis) +SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis) { return softmax_layer_generic(src, beta, axis, true); } -template ::value || std::is_same::value, int>::type> -SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis) +template < typename T, typename std::enable_if < std::is_same::value || std::is_same::value, int >::type > +SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis) { const QuantizationInfo output_quantization_info = arm_compute::get_softmax_output_quantization_info(src.data_type(), true); @@ -51,10 +51,10 @@ SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t return dst; } -template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis); -template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis); -template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis); -template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis); +template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis); +template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis); +template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis); +template SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/LogSoftmaxLayer.h b/tests/validation/reference/LogSoftmaxLayer.h index c2e3f5974e..48ffdcfbcc 100644 --- a/tests/validation/reference/LogSoftmaxLayer.h +++ b/tests/validation/reference/LogSoftmaxLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,10 +36,10 @@ namespace validation namespace reference { template ::value, int>::type = 0> -SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis = 1); +SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis = -1); -template ::value || std::is_same::value, int>::type = 0> -SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, size_t axis = 1); +template < typename T, typename std::enable_if < std::is_same::value || std::is_same::value, int >::type = 0 > +SimpleTensor log_softmax_layer(const SimpleTensor &src, float beta, int32_t axis = -1); } // namespace reference } // namespace validation } // namespace test 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 ::value, int>::type> -SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, size_t axis, bool is_log) +SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, int32_t axis, bool is_log) { // Create reference SimpleTensor 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(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(axis); i < TensorShape::num_max_dimensions; ++i) { upper_dims *= src.shape()[i]; } @@ -101,17 +107,17 @@ SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, si return dst; } -template SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, size_t axis, bool is_log); -template SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, size_t axis, bool is_log); +template SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, int32_t axis, bool is_log); +template SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, int32_t axis, bool is_log); template ::value, int>::type> -SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis) +SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis) { return softmax_layer_generic(src, beta, axis, false); } template < typename T, typename std::enable_if < std::is_same::value || std::is_same::value, int >::type > -SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis) +SimpleTensor softmax_layer(const SimpleTensor &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 softmax_layer(const SimpleTensor &src, float beta, size_t axi return dst; } -template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis); -template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis); -template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis); -template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis); +template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis); +template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis); +template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis); +template SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/SoftmaxLayer.h b/tests/validation/reference/SoftmaxLayer.h index 2be575c2af..f819853d95 100644 --- a/tests/validation/reference/SoftmaxLayer.h +++ b/tests/validation/reference/SoftmaxLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,13 +36,13 @@ namespace validation namespace reference { template ::value, int>::type = 0> -SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, size_t axis, bool is_log = false); +SimpleTensor softmax_layer_generic(const SimpleTensor &src, float beta, int32_t axis, bool is_log = false); template ::value, int>::type = 0> -SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis = 1); +SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis = -1); -template ::value || std::is_same::value, int>::type = 0> -SimpleTensor softmax_layer(const SimpleTensor &src, float beta, size_t axis = 1); +template < typename T, typename std::enable_if < std::is_same::value || std::is_same::value, int >::type = 0 > +SimpleTensor softmax_layer(const SimpleTensor &src, float beta, int32_t axis = -1); } // namespace reference } // namespace validation } // namespace test -- cgit v1.2.1