From d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Thu, 29 Jun 2017 14:51:57 +0100 Subject: COMPMID-417: Extract common toolchain support file The support file is needed as Android toolchains are missing some C++11 functions. It further includes functions that have been introduced in C++14 but which we already need. Eventually the support file might become unnecessary if the Android compilers improve and we switch to C++14. Change-Id: Ib5ec506f1a17c78149c315ab2096b901b852c180 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79247 Reviewed-by: Georgios Pinitas Tested-by: Kaizen Reviewed-by: Pablo Tello --- src/runtime/CL/functions/CLOpticalFlow.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/runtime/CL/functions/CLOpticalFlow.cpp') diff --git a/src/runtime/CL/functions/CLOpticalFlow.cpp b/src/runtime/CL/functions/CLOpticalFlow.cpp index a6b0eb3bec..542f5961fa 100644 --- a/src/runtime/CL/functions/CLOpticalFlow.cpp +++ b/src/runtime/CL/functions/CLOpticalFlow.cpp @@ -26,7 +26,6 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/kernels/CLLKTrackerKernel.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Window.h" #include "arm_compute/runtime/CL/CLPyramid.h" @@ -34,6 +33,7 @@ #include "arm_compute/runtime/CL/CLTensor.h" #include "arm_compute/runtime/CL/CLTensorAllocator.h" #include "arm_compute/runtime/CL/functions/CLScharr3x3.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -70,21 +70,21 @@ void CLOpticalFlow::configure(const CLPyramid *old_pyramid, const CLPyramid *new const int old_values_list_length = list_length * window_dimension * window_dimension; // Create kernels and tensors - _tracker_init_kernel = arm_compute::cpp14::make_unique(_num_levels); - _tracker_stage0_kernel = arm_compute::cpp14::make_unique(_num_levels); - _tracker_stage1_kernel = arm_compute::cpp14::make_unique(_num_levels); - _func_scharr = arm_compute::cpp14::make_unique(_num_levels); - _scharr_gx = arm_compute::cpp14::make_unique(_num_levels); - _scharr_gy = arm_compute::cpp14::make_unique(_num_levels); + _tracker_init_kernel = arm_compute::support::cpp14::make_unique(_num_levels); + _tracker_stage0_kernel = arm_compute::support::cpp14::make_unique(_num_levels); + _tracker_stage1_kernel = arm_compute::support::cpp14::make_unique(_num_levels); + _func_scharr = arm_compute::support::cpp14::make_unique(_num_levels); + _scharr_gx = arm_compute::support::cpp14::make_unique(_num_levels); + _scharr_gy = arm_compute::support::cpp14::make_unique(_num_levels); // Create internal keypoint arrays - _old_points_internal = arm_compute::cpp14::make_unique(list_length); + _old_points_internal = arm_compute::support::cpp14::make_unique(list_length); _old_points_internal->resize(list_length); - _new_points_internal = arm_compute::cpp14::make_unique(list_length); + _new_points_internal = arm_compute::support::cpp14::make_unique(list_length); _new_points_internal->resize(list_length); - _coefficient_table = arm_compute::cpp14::make_unique(list_length); + _coefficient_table = arm_compute::support::cpp14::make_unique(list_length); _coefficient_table->resize(list_length); - _old_values = arm_compute::cpp14::make_unique(old_values_list_length); + _old_values = arm_compute::support::cpp14::make_unique(old_values_list_length); _old_values->resize(old_values_list_length); _new_points->resize(list_length); -- cgit v1.2.1