From 29cab36ddd73c174bf6b2de453663aa49c1cc576 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Thu, 10 Mar 2022 17:05:34 +0000 Subject: Fixed clang-cl errors on Windows native builds. Partially resolves MLCE-739 Change-Id: Ice06a96d6a8a26b31e334ba4e697cd41d352b026 Signed-off-by: Pablo Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7364 Comments-Addressed: Arm Jenkins Reviewed-by: Gunes Bayir Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/fixtures/ArgMinMaxFixture.h | 6 +++--- .../validation/fixtures/ConvertFullyConnectedWeightsFixture.h | 4 ++-- tests/validation/fixtures/ConvolutionLayerFixture.h | 8 ++++---- tests/validation/fixtures/DeconvolutionLayerFixture.h | 8 ++++---- tests/validation/fixtures/DepthConvertLayerFixture.h | 4 ++-- tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h | 6 +++--- tests/validation/fixtures/DirectConvolutionLayerFixture.h | 6 +++--- tests/validation/fixtures/FullyConnectedLayerFixture.h | 10 +++++----- tests/validation/fixtures/GEMMLowpFixture.h | 4 ++-- tests/validation/fixtures/ReductionOperationFixture.h | 6 +++--- tests/validation/fixtures/ScaleFixture.h | 6 +++--- 11 files changed, 34 insertions(+), 34 deletions(-) (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/ArgMinMaxFixture.h b/tests/validation/fixtures/ArgMinMaxFixture.h index caa6bb8d9c..2bbce4077e 100644 --- a/tests/validation/fixtures/ArgMinMaxFixture.h +++ b/tests/validation/fixtures/ArgMinMaxFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -80,7 +80,7 @@ protected: case DataType::QASYMM8: { std::pair bounds = get_quantized_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, 0); break; @@ -88,7 +88,7 @@ protected: case DataType::QASYMM8_SIGNED: { std::pair bounds = get_quantized_qasymm8_signed_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, 0); break; diff --git a/tests/validation/fixtures/ConvertFullyConnectedWeightsFixture.h b/tests/validation/fixtures/ConvertFullyConnectedWeightsFixture.h index ae844332c3..38088b4000 100644 --- a/tests/validation/fixtures/ConvertFullyConnectedWeightsFixture.h +++ b/tests/validation/fixtures/ConvertFullyConnectedWeightsFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -61,7 +61,7 @@ protected: { case DataType::QASYMM8: { - std::uniform_int_distribution distribution(0, 10); + std::uniform_int_distribution distribution(0, 10); library->fill(tensor, distribution, i); break; } diff --git a/tests/validation/fixtures/ConvolutionLayerFixture.h b/tests/validation/fixtures/ConvolutionLayerFixture.h index 0b3f070e9c..bffdc59758 100644 --- a/tests/validation/fixtures/ConvolutionLayerFixture.h +++ b/tests/validation/fixtures/ConvolutionLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -122,14 +122,14 @@ protected: case DataType::QASYMM8: { std::pair bounds = get_quantized_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, i); break; } case DataType::QASYMM8_SIGNED: { std::pair bounds = get_quantized_qasymm8_signed_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, i); break; } @@ -149,7 +149,7 @@ protected: max_bound = bounds.second; } } - std::uniform_int_distribution distribution(min_bound, max_bound); + std::uniform_int_distribution distribution(min_bound, max_bound); library->fill(tensor, distribution, i); break; } diff --git a/tests/validation/fixtures/DeconvolutionLayerFixture.h b/tests/validation/fixtures/DeconvolutionLayerFixture.h index 14f071eed0..d13eab2f54 100644 --- a/tests/validation/fixtures/DeconvolutionLayerFixture.h +++ b/tests/validation/fixtures/DeconvolutionLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -75,14 +75,14 @@ protected: case DataType::QASYMM8: { std::pair bounds = get_quantized_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, i); break; } case DataType::QASYMM8_SIGNED: { std::pair bounds = get_quantized_qasymm8_signed_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, i); break; } @@ -102,7 +102,7 @@ protected: max_bound = bounds.second; } } - std::uniform_int_distribution distribution(min_bound, max_bound); + std::uniform_int_distribution distribution(min_bound, max_bound); library->fill(tensor, distribution, i); break; } diff --git a/tests/validation/fixtures/DepthConvertLayerFixture.h b/tests/validation/fixtures/DepthConvertLayerFixture.h index 130b583dc1..53d29b44ba 100644 --- a/tests/validation/fixtures/DepthConvertLayerFixture.h +++ b/tests/validation/fixtures/DepthConvertLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -61,7 +61,7 @@ protected: if(is_data_type_quantized(tensor.data_type())) { std::pair bounds = get_quantized_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, i); } diff --git a/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h index cecccc87bb..9fd973ad20 100644 --- a/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h +++ b/tests/validation/fixtures/DepthwiseConvolutionLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -199,14 +199,14 @@ protected: { case DataType::QASYMM8: { - std::uniform_int_distribution distribution(0, 15); + std::uniform_int_distribution distribution(0, 15); library->fill(tensor, distribution, i); break; } case DataType::QASYMM8_SIGNED: case DataType::QSYMM8_PER_CHANNEL: { - std::uniform_int_distribution distribution(-10, 10); + std::uniform_int_distribution distribution(-10, 10); library->fill(tensor, distribution, i); break; } diff --git a/tests/validation/fixtures/DirectConvolutionLayerFixture.h b/tests/validation/fixtures/DirectConvolutionLayerFixture.h index 614aa20753..31186e2b1d 100644 --- a/tests/validation/fixtures/DirectConvolutionLayerFixture.h +++ b/tests/validation/fixtures/DirectConvolutionLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -112,14 +112,14 @@ protected: { case DataType::QASYMM8: { - std::uniform_int_distribution distribution(0, 50); + std::uniform_int_distribution distribution(0, 50); library->fill(tensor, distribution, i); break; } case DataType::QASYMM8_SIGNED: { // Use small input range to avoid all the test results being saturated at the end. - std::uniform_int_distribution distribution(-25, 25); + std::uniform_int_distribution distribution(-25, 25); library->fill(tensor, distribution, i); break; } diff --git a/tests/validation/fixtures/FullyConnectedLayerFixture.h b/tests/validation/fixtures/FullyConnectedLayerFixture.h index 3048c56f6b..b5efccdf70 100644 --- a/tests/validation/fixtures/FullyConnectedLayerFixture.h +++ b/tests/validation/fixtures/FullyConnectedLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -92,12 +92,12 @@ protected: { if(_data_type == DataType::QASYMM8) { - std::uniform_int_distribution distribution(0, 30); + std::uniform_int_distribution distribution(0, 30); library->fill(tensor, distribution, i); } else if(_data_type == DataType::QASYMM8_SIGNED) { - std::uniform_int_distribution distribution(-15, 15); + std::uniform_int_distribution distribution(-15, 15); library->fill(tensor, distribution, i); } else if(_data_type == DataType::S32) @@ -291,7 +291,7 @@ private: } else if(_data_type == DataType::QASYMM8) { - std::uniform_int_distribution distribution(0, 30); + std::uniform_int_distribution distribution(0, 30); library->fill(tensor, distribution, i); } else if(_data_type == DataType::S32) @@ -336,7 +336,7 @@ private: } else if(_data_type == DataType::QASYMM8) { - constexpr AbsoluteTolerance tolerance_qasymm8(1); + constexpr AbsoluteTolerance tolerance_qasymm8(1); validate(AccessorType(target), ref, tolerance_qasymm8); } else diff --git a/tests/validation/fixtures/GEMMLowpFixture.h b/tests/validation/fixtures/GEMMLowpFixture.h index 3da4c02f6d..5fe7d83efd 100644 --- a/tests/validation/fixtures/GEMMLowpFixture.h +++ b/tests/validation/fixtures/GEMMLowpFixture.h @@ -67,13 +67,13 @@ void fill(U &&tensor, int i) max_bound = bounds.second; } } - std::uniform_int_distribution distribution(min_bound, max_bound); + std::uniform_int_distribution distribution(min_bound, max_bound); library->fill(tensor, distribution, i); break; } case DataType::QASYMM8: { - std::uniform_int_distribution distribution(1, 254); + std::uniform_int_distribution distribution(1, 254); library->fill(tensor, distribution, i); break; } diff --git a/tests/validation/fixtures/ReductionOperationFixture.h b/tests/validation/fixtures/ReductionOperationFixture.h index fc422ad35b..c333f1391f 100644 --- a/tests/validation/fixtures/ReductionOperationFixture.h +++ b/tests/validation/fixtures/ReductionOperationFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -76,14 +76,14 @@ protected: if(tensor.data_type() == DataType::QASYMM8) { std::pair bounds = get_quantized_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, 0); } else if(tensor.data_type() == DataType::QASYMM8_SIGNED) { std::pair bounds = get_quantized_qasymm8_signed_bounds(tensor.quantization_info(), -1.0f, 1.0f); - std::uniform_int_distribution distribution(bounds.first, bounds.second); + std::uniform_int_distribution distribution(bounds.first, bounds.second); library->fill(tensor, distribution, 0); } diff --git a/tests/validation/fixtures/ScaleFixture.h b/tests/validation/fixtures/ScaleFixture.h index b719a22fdf..c0b44bcb5f 100644 --- a/tests/validation/fixtures/ScaleFixture.h +++ b/tests/validation/fixtures/ScaleFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2021 Arm Limited. + * Copyright (c) 2017-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -59,8 +59,8 @@ public: generate_scale(shape); - std::mt19937 generator(library->seed()); - std::uniform_int_distribution distribution_u8(0, 255); + std::mt19937 generator(library->seed()); + std::uniform_int_distribution distribution_u8(0, 255); _constant_border_value = static_cast(distribution_u8(generator)); _target = compute_target(shape, data_layout); -- cgit v1.2.1