From 299fdd31bd8e1add3ac557a5e630de55b1b6659c 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: I4beacfd714ee3ed771fd174cce5d8009a2961380 Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/1065 Reviewed-by: Giuseppe Rossini Tested-by: Arm Jenkins --- .../GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/runtime/GLES_COMPUTE') diff --git a/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp index aa937a66b4..b89aafa2e5 100755 --- a/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCDepthConcatenateLayer.cpp @@ -47,13 +47,18 @@ void GCDepthConcatenateLayer::configure(std::vector inputs_vector, unsigned int depth_offset = 0; - _concat_kernels_vector = arm_compute::support::cpp14::make_unique(_num_inputs); - _border_handlers_vector = arm_compute::support::cpp14::make_unique(_num_inputs); + _concat_kernels_vector.reserve(_num_inputs); + _border_handlers_vector.reserve(_num_inputs); for(unsigned int i = 0; i < _num_inputs; i++) { - _concat_kernels_vector[i].configure(inputs_vector.at(i), depth_offset, output); - _border_handlers_vector[i].configure(inputs_vector.at(i), _concat_kernels_vector[i].border_size(), BorderMode::CONSTANT, PixelValue()); + auto concat_kernel = support::cpp14::make_unique(); + auto border_kernel = support::cpp14::make_unique(); + + concat_kernel->configure(inputs_vector.at(i), depth_offset, output); + border_kernel->configure(inputs_vector.at(i), concat_kernel->border_size(), BorderMode::CONSTANT, PixelValue()); + _concat_kernels_vector.emplace_back(std::move(concat_kernel)); + _border_handlers_vector.emplace_back(std::move(border_kernel)); depth_offset += inputs_vector.at(i)->info()->dimension(2); } @@ -63,8 +68,8 @@ void GCDepthConcatenateLayer::run() { for(unsigned i = 0; i < _num_inputs; i++) { - GCScheduler::get().dispatch(_border_handlers_vector[i], false); + GCScheduler::get().dispatch(*_border_handlers_vector[i].get(), false); GCScheduler::get().memory_barrier(); - GCScheduler::get().dispatch(_concat_kernels_vector[i], true); + GCScheduler::get().dispatch(*_concat_kernels_vector[i].get(), true); } } -- cgit v1.2.1