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/NEON/functions/NEHOGMultiDetection.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/runtime/NEON/functions/NEHOGMultiDetection.cpp') diff --git a/src/runtime/NEON/functions/NEHOGMultiDetection.cpp b/src/runtime/NEON/functions/NEHOGMultiDetection.cpp index 173b8f4c42..635b793d0c 100644 --- a/src/runtime/NEON/functions/NEHOGMultiDetection.cpp +++ b/src/runtime/NEON/functions/NEHOGMultiDetection.cpp @@ -24,10 +24,11 @@ #include "arm_compute/runtime/NEON/functions/NEHOGMultiDetection.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/TensorInfo.h" +#include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" #include "arm_compute/runtime/Tensor.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -112,12 +113,12 @@ void NEHOGMultiDetection::configure(ITensor *input, const IMultiHOG *multi_hog, _num_block_norm_kernel = input_block_norm.size(); // Number of NEHOGBlockNormalizationKernel kernels to compute _num_hog_detect_kernel = input_hog_detect.size(); // Number of NEHOGDetector functions to compute - _orient_bin_kernel = arm_compute::cpp14::make_unique(_num_orient_bin_kernel); - _block_norm_kernel = arm_compute::cpp14::make_unique(_num_block_norm_kernel); - _hog_detect_kernel = arm_compute::cpp14::make_unique(_num_hog_detect_kernel); - _non_maxima_kernel = arm_compute::cpp14::make_unique(); - _hog_space = arm_compute::cpp14::make_unique(_num_orient_bin_kernel); - _hog_norm_space = arm_compute::cpp14::make_unique(_num_block_norm_kernel); + _orient_bin_kernel = arm_compute::support::cpp14::make_unique(_num_orient_bin_kernel); + _block_norm_kernel = arm_compute::support::cpp14::make_unique(_num_block_norm_kernel); + _hog_detect_kernel = arm_compute::support::cpp14::make_unique(_num_hog_detect_kernel); + _non_maxima_kernel = arm_compute::support::cpp14::make_unique(); + _hog_space = arm_compute::support::cpp14::make_unique(_num_orient_bin_kernel); + _hog_norm_space = arm_compute::support::cpp14::make_unique(_num_block_norm_kernel); // Allocate tensors for magnitude and phase TensorInfo info_mag(shape_img, Format::S16); -- cgit v1.2.1