diff options
| author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-06-29 14:51:57 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:15:39 +0100 |
| commit | d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade (patch) | |
| tree | e4b035d01add61c37fcbeaf38a6a54e550235d8f /src/runtime/NEON/functions/NEGaussianPyramid.cpp | |
| parent | 5cb4c42cb5d781a44409ebc97a408e1379ce182d (diff) | |
| download | ComputeLibrary-d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade.tar.gz | |
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 <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions/NEGaussianPyramid.cpp')
| -rw-r--r-- | src/runtime/NEON/functions/NEGaussianPyramid.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/runtime/NEON/functions/NEGaussianPyramid.cpp b/src/runtime/NEON/functions/NEGaussianPyramid.cpp index e1d64f11f6..75c439511e 100644 --- a/src/runtime/NEON/functions/NEGaussianPyramid.cpp +++ b/src/runtime/NEON/functions/NEGaussianPyramid.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NEGaussianPyramid.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/ITensor.h" #include "arm_compute/core/NEON/kernels/NEGaussianPyramidKernel.h" #include "arm_compute/core/NEON/kernels/NEScaleKernel.h" @@ -36,6 +35,7 @@ #include "arm_compute/runtime/Pyramid.h" #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" #include <cstddef> @@ -68,9 +68,9 @@ void NEGaussianPyramidHalf::configure(const ITensor *input, IPyramid *pyramid, B if(num_levels > 1) { - _border_handler = arm_compute::cpp14::make_unique<NEFillBorderKernel[]>(num_levels - 1); - _horizontal_reduction = arm_compute::cpp14::make_unique<NEGaussianPyramidHorKernel[]>(num_levels - 1); - _vertical_reduction = arm_compute::cpp14::make_unique<NEGaussianPyramidVertKernel[]>(num_levels - 1); + _border_handler = arm_compute::support::cpp14::make_unique<NEFillBorderKernel[]>(num_levels - 1); + _horizontal_reduction = arm_compute::support::cpp14::make_unique<NEGaussianPyramidHorKernel[]>(num_levels - 1); + _vertical_reduction = arm_compute::support::cpp14::make_unique<NEGaussianPyramidVertKernel[]>(num_levels - 1); // Apply half scale to the X dimension of the tensor shape TensorShape tensor_shape = pyramid->info()->tensor_shape(); @@ -135,9 +135,9 @@ void NEGaussianPyramidOrb::configure(const ITensor *input, IPyramid *pyramid, Bo if(num_levels > 1) { - _gaus5x5 = arm_compute::cpp14::make_unique<NEGaussian5x5[]>(num_levels - 1); - _scale_nearest = arm_compute::cpp14::make_unique<NEScaleKernel[]>(num_levels - 1); - _offsets = arm_compute::cpp14::make_unique<Image[]>(num_levels - 1); + _gaus5x5 = arm_compute::support::cpp14::make_unique<NEGaussian5x5[]>(num_levels - 1); + _scale_nearest = arm_compute::support::cpp14::make_unique<NEScaleKernel[]>(num_levels - 1); + _offsets = arm_compute::support::cpp14::make_unique<Image[]>(num_levels - 1); PyramidInfo pyramid_info(num_levels - 1, SCALE_PYRAMID_ORB, pyramid->info()->tensor_shape(), Format::U8); _tmp.init(pyramid_info); |