diff options
| author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-04-29 17:25:20 +0100 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-05-01 08:35:56 +0000 |
| commit | bc0e1c969261f4ba65451dc5fe29acfb80671f68 (patch) | |
| tree | 52f566a2991bd8572eee4854f447053a5601589b /tests | |
| parent | 51ca6ae70680f6c7aaa1900fe6ff4d3ee4e90b08 (diff) | |
| download | ComputeLibrary-bc0e1c969261f4ba65451dc5fe29acfb80671f68.tar.gz | |
COMPMID-3069: Allow different quantization info in NEElementwiseMin/Max
Change-Id: I97f9f7e9f054b2a812a23b25cfb21033f76a9101
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3125
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/validation/NEON/ElementwiseMax.cpp | 18 | ||||
| -rw-r--r-- | tests/validation/NEON/ElementwiseMin.cpp | 16 |
2 files changed, 14 insertions, 20 deletions
diff --git a/tests/validation/NEON/ElementwiseMax.cpp b/tests/validation/NEON/ElementwiseMax.cpp index fc6bb9454d..bd61ba50a3 100644 --- a/tests/validation/NEON/ElementwiseMax.cpp +++ b/tests/validation/NEON/ElementwiseMax.cpp @@ -41,7 +41,8 @@ namespace validation { namespace { -RelativeTolerance<float> tolerance_fp32(0.000001f); +constexpr RelativeTolerance<float> tolerance_fp32(0.000001f); +constexpr AbsoluteTolerance<int8_t> tolerance_qasymm8_signed(1); /** Input data sets **/ const auto ElementwiseMaxQASYMM8Dataset = combine(combine(framework::dataset::make("DataType", DataType::QASYMM8), framework::dataset::make("DataType", DataType::QASYMM8)), framework::dataset::make("DataType", @@ -79,8 +80,6 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Mismatching shapes TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED), // OK TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED), // Mismatching data types - TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED,QuantizationInfo(0.1f, 2) ), // Mismatching qinfo - }), framework::dataset::make("Input2Info",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S32), @@ -89,8 +88,6 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32), TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED), TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8), - TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED,QuantizationInfo(0.4f, 5) ), // Mismatching qinfo - })), framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S32), @@ -99,10 +96,9 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32), TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED), TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED), - TensorInfo(TensorShape(8U, 8U, 3U), 1, DataType::QASYMM8_SIGNED,QuantizationInfo(0.3f,4 ) ), // Mismatching qinfo })), - framework::dataset::make("Expected", { true, true, true, false, false, true, false, false,false})), + framework::dataset::make("Expected", { true, true, true, false, false, true, false, false })), input1_info, input2_info, output_info, expected) { ARM_COMPUTE_EXPECT(bool(NEElementwiseMax::validate( @@ -162,12 +158,12 @@ TEST_SUITE_END() TEST_SUITE(QASYMM8_SIGNED) FIXTURE_DATA_TEST_CASE(RunSmall, NEElementwiseMaxQuantizedFixture<int8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), ElementwiseMaxQASYMM8SignedDataset), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 2) })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 2) })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 2) }))) + framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 20) })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(1.f, 0) })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(2.f, -27) }))) { // Validate output - validate(Accessor(_target), _reference); + validate(Accessor(_target), _reference, tolerance_qasymm8_signed); } TEST_SUITE_END() diff --git a/tests/validation/NEON/ElementwiseMin.cpp b/tests/validation/NEON/ElementwiseMin.cpp index 9b950a06a7..0fc6f5fead 100644 --- a/tests/validation/NEON/ElementwiseMin.cpp +++ b/tests/validation/NEON/ElementwiseMin.cpp @@ -41,7 +41,8 @@ namespace validation { namespace { -RelativeTolerance<float> tolerance_fp32(0.000001f); +constexpr RelativeTolerance<float> tolerance_fp32(0.000001f); +constexpr AbsoluteTolerance<int8_t> tolerance_qasymm8_signed(1); /** Input data sets **/ const auto ElementwiseMinQASYMM8Dataset = combine(combine(framework::dataset::make("DataType", DataType::QASYMM8), framework::dataset::make("DataType", DataType::QASYMM8)), framework::dataset::make("DataType", @@ -79,7 +80,6 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), // Mismatching shapes TensorInfo(TensorShape(4U, 4U, 2U), 1, DataType::QASYMM8_SIGNED), // Ok TensorInfo(TensorShape(4U, 4U, 2U), 1, DataType::QASYMM8_SIGNED), // Mismatching types, cannot mix QASYMM8_SIGNED with QASYMM8 - TensorInfo(TensorShape(1U, 2U, 3U), 1, DataType::QASYMM8_SIGNED,QuantizationInfo(0.1f, 2) ), // Mismatching qinfo }), framework::dataset::make("Input2Info",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S32), @@ -88,7 +88,6 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32), TensorInfo(TensorShape(4U, 4U, 2U), 1, DataType::QASYMM8_SIGNED), TensorInfo(TensorShape(4U, 4U, 2U), 1, DataType::QASYMM8), - TensorInfo(TensorShape(1U, 2U, 3U), 1, DataType::QASYMM8_SIGNED,QuantizationInfo(0.5f, 1) ), })), framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::F32), TensorInfo(TensorShape(32U, 13U, 2U), 1, DataType::S32), @@ -97,10 +96,9 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( TensorInfo(TensorShape(48U, 11U, 2U), 1, DataType::F32), TensorInfo(TensorShape(4U, 4U, 2U), 1, DataType::QASYMM8_SIGNED), TensorInfo(TensorShape(4U, 4U, 2U), 1, DataType::QASYMM8_SIGNED), - TensorInfo(TensorShape(1U, 2U, 3U), 1, DataType::QASYMM8_SIGNED,QuantizationInfo(0.5f, 1) ), })), framework::dataset::make("Expected", { true, true, true, false, - false,true,false,false})), + false,true,false})), input1_info, input2_info, output_info, expected) { ARM_COMPUTE_EXPECT(bool(NEElementwiseMin::validate( @@ -161,12 +159,12 @@ TEST_SUITE_END() TEST_SUITE(QASYMM8_SIGNED) FIXTURE_DATA_TEST_CASE(RunSmall, NEElementwiseMinQuantizedFixture<int8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), ElementwiseMaxQASYMM8SignedDataset), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 2) })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 2) })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 2) }))) + framework::dataset::make("QuantizationInfo", { QuantizationInfo(10.f, 20) })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(1.f, 0) })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(2.f, -27) }))) { // Validate output - validate(Accessor(_target), _reference); + validate(Accessor(_target), _reference, tolerance_qasymm8_signed); } TEST_SUITE_END() |