From 9d0b5f82c2734444145718f12788f2dde436ef45 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Wed, 1 May 2019 13:03:59 +0100 Subject: COMPMID-2177 Fix clang warnings Change-Id: I78039db8c58d7b14a042c41e54c25fb9cb509bf7 Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/1092 Reviewed-by: VidhyaSudhan Loganathan Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/CL/Convolution.cpp | 20 ++++++++++---------- tests/validation/CL/DepthConcatenateLayer.cpp | 1 + tests/validation/CL/NonLinearFilter.cpp | 6 +++--- tests/validation/CL/Split.cpp | 4 +++- tests/validation/CL/WidthConcatenateLayer.cpp | 1 + 5 files changed, 18 insertions(+), 14 deletions(-) (limited to 'tests/validation/CL') diff --git a/tests/validation/CL/Convolution.cpp b/tests/validation/CL/Convolution.cpp index 0c00ee301b..9c33d45f97 100644 --- a/tests/validation/CL/Convolution.cpp +++ b/tests/validation/CL/Convolution.cpp @@ -54,14 +54,14 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::NIGHTLY, combine(combine(c CLTensor dst = create_tensor(shape, output_data_type); // Create conv matrix - int16_t conv[9]; + std::array conv = { 0 }; ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function CLConvolution3x3 convolution; - convolution.configure(&src, &dst, conv, 0, border_mode); + convolution.configure(&src, &dst, conv.data(), 0, border_mode); // Validate valid region const ValidRegion dst_valid_region = shape_to_valid_region(shape, (border_mode == BorderMode::UNDEFINED), BorderSize(filter_size / 2)); @@ -122,14 +122,14 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::NIGHTLY, combine(combine(c CLTensor dst = create_tensor(shape, output_data_type); // Create conv matrix - int16_t conv[25]; + std::array conv = { 0 }; ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function CLConvolution5x5 convolution; - convolution.configure(&src, &dst, conv, 0, border_mode); + convolution.configure(&src, &dst, conv.data(), 0, border_mode); // Validate valid region const ValidRegion dst_valid_region = shape_to_valid_region(shape, (border_mode == BorderMode::UNDEFINED), BorderSize(filter_size / 2)); @@ -190,14 +190,14 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::NIGHTLY, combine(combine(c CLTensor dst = create_tensor(shape, output_data_type); // Create conv matrix - int16_t conv[49]; + std::array conv = { 0 }; ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function CLConvolution7x7 convolution; - convolution.configure(&src, &dst, conv, 0, border_mode); + convolution.configure(&src, &dst, conv.data(), 0, border_mode); // Validate valid region const ValidRegion dst_valid_region = shape_to_valid_region(shape, (border_mode == BorderMode::UNDEFINED), BorderSize(filter_size / 2)); @@ -258,14 +258,14 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::NIGHTLY, combine(combine(c CLTensor dst = create_tensor(shape, output_data_type); // Create conv matrix - int16_t conv[81]; + std::array conv = { 0 }; ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function CLConvolution9x9 convolution; - convolution.configure(&src, &dst, conv, 0, border_mode); + convolution.configure(&src, &dst, conv.data(), 0, border_mode); // Validate valid region const ValidRegion dst_valid_region = shape_to_valid_region(shape, (border_mode == BorderMode::UNDEFINED), BorderSize(filter_size / 2)); @@ -328,14 +328,14 @@ shape, output_data_type, border_mode, filter_width, filter_height) CLTensor dst = create_tensor(shape, output_data_type); // Create conv matrix - int16_t conv[filter_width * filter_height]; + std::vector conv(filter_width * filter_height); ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); // Create and configure function CLConvolutionRectangle convolution; - convolution.configure(&src, &dst, conv, filter_width, filter_height, 1, border_mode); + convolution.configure(&src, &dst, conv.data(), filter_width, filter_height, 1, border_mode); // Validate valid region const ValidRegion dst_valid_region = shape_to_valid_region(shape, (border_mode == BorderMode::UNDEFINED), BorderSize(filter_height / 2, filter_width / 2)); diff --git a/tests/validation/CL/DepthConcatenateLayer.cpp b/tests/validation/CL/DepthConcatenateLayer.cpp index beda637ef3..8cbfda382b 100644 --- a/tests/validation/CL/DepthConcatenateLayer.cpp +++ b/tests/validation/CL/DepthConcatenateLayer.cpp @@ -68,6 +68,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( inputs_vector_info.emplace_back(std::move(input_info2)); std::vector inputs_vector_info_raw; + inputs_vector_info_raw.reserve(inputs_vector_info.size()); for(auto &input : inputs_vector_info) { inputs_vector_info_raw.emplace_back(&input); diff --git a/tests/validation/CL/NonLinearFilter.cpp b/tests/validation/CL/NonLinearFilter.cpp index 286cc483b8..536b458975 100644 --- a/tests/validation/CL/NonLinearFilter.cpp +++ b/tests/validation/CL/NonLinearFilter.cpp @@ -52,8 +52,8 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi const uint8_t constant_border_value = distribution_u8(generator); // Create the mask - uint8_t mask[mask_size * mask_size]; - fill_mask_from_pattern(mask, mask_size, mask_size, pattern); + std::vector mask(mask_size * mask_size); + fill_mask_from_pattern(mask.data(), mask_size, mask_size, pattern); const auto half_mask_size = static_cast(mask_size / 2); // Create tensors @@ -65,7 +65,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi // Create and configure function CLNonLinearFilter filter; - filter.configure(&src, &dst, function, mask_size, pattern, mask, border_mode, constant_border_value); + filter.configure(&src, &dst, function, mask_size, pattern, mask.data(), border_mode, constant_border_value); // Validate valid region const ValidRegion dst_valid_region = shape_to_valid_region(shape, border_mode == BorderMode::UNDEFINED, BorderSize(half_mask_size)); diff --git a/tests/validation/CL/Split.cpp b/tests/validation/CL/Split.cpp index 77363189cf..e038b89856 100644 --- a/tests/validation/CL/Split.cpp +++ b/tests/validation/CL/Split.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -57,6 +57,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( { std::vector outputs_info(splits); std::vector outputs_info_ptr; + outputs_info_ptr.reserve(splits); for(auto &output_info : outputs_info) { outputs_info_ptr.emplace_back(&output_info); @@ -76,6 +77,7 @@ DATA_TEST_CASE(Configuration, CLTensor src = create_tensor(shape, data_type); std::vector dsts(splits); std::vector dsts_ptrs; + dsts_ptrs.reserve(splits); for(auto &dst : dsts) { dsts_ptrs.emplace_back(&dst); diff --git a/tests/validation/CL/WidthConcatenateLayer.cpp b/tests/validation/CL/WidthConcatenateLayer.cpp index 2c1eb7fada..52a4e4ccd6 100644 --- a/tests/validation/CL/WidthConcatenateLayer.cpp +++ b/tests/validation/CL/WidthConcatenateLayer.cpp @@ -72,6 +72,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( inputs_vector_info.emplace_back(std::move(input_info2)); std::vector inputs_vector_info_raw; + inputs_vector_info_raw.reserve(inputs_vector_info.size()); for(auto &input : inputs_vector_info) { inputs_vector_info_raw.emplace_back(&input); -- cgit v1.2.1