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/NEON/DepthConcatenateLayer.cpp | 1 + tests/validation/NEON/HeightConcatenateLayer.cpp | 1 + tests/validation/NEON/NonLinearFilter.cpp | 6 +++--- tests/validation/NEON/Split.cpp | 2 ++ tests/validation/NEON/WidthConcatenateLayer.cpp | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) (limited to 'tests/validation/NEON') diff --git a/tests/validation/NEON/DepthConcatenateLayer.cpp b/tests/validation/NEON/DepthConcatenateLayer.cpp index 0ddb220d34..844c3987db 100644 --- a/tests/validation/NEON/DepthConcatenateLayer.cpp +++ b/tests/validation/NEON/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/NEON/HeightConcatenateLayer.cpp b/tests/validation/NEON/HeightConcatenateLayer.cpp index 9c23fb9bd3..075dfa3b24 100644 --- a/tests/validation/NEON/HeightConcatenateLayer.cpp +++ b/tests/validation/NEON/HeightConcatenateLayer.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); diff --git a/tests/validation/NEON/NonLinearFilter.cpp b/tests/validation/NEON/NonLinearFilter.cpp index b3d4c93744..08ad1e2407 100644 --- a/tests/validation/NEON/NonLinearFilter.cpp +++ b/tests/validation/NEON/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 NENonLinearFilter 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/NEON/Split.cpp b/tests/validation/NEON/Split.cpp index 17360960e0..91b3b9a047 100644 --- a/tests/validation/NEON/Split.cpp +++ b/tests/validation/NEON/Split.cpp @@ -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, Tensor 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/NEON/WidthConcatenateLayer.cpp b/tests/validation/NEON/WidthConcatenateLayer.cpp index ed840ef325..ba0ff1bd81 100644 --- a/tests/validation/NEON/WidthConcatenateLayer.cpp +++ b/tests/validation/NEON/WidthConcatenateLayer.cpp @@ -70,6 +70,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