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 --- .../NEON/functions/NEAbsoluteDifference.cpp | 4 ++-- src/runtime/NEON/functions/NEAccumulate.cpp | 10 +++++----- src/runtime/NEON/functions/NEActivationLayer.cpp | 4 ++-- .../NEON/functions/NEArithmeticAddition.cpp | 4 ++-- .../NEON/functions/NEArithmeticSubtraction.cpp | 4 ++-- src/runtime/NEON/functions/NEBitwiseAnd.cpp | 4 ++-- src/runtime/NEON/functions/NEBitwiseNot.cpp | 4 ++-- src/runtime/NEON/functions/NEBitwiseOr.cpp | 4 ++-- src/runtime/NEON/functions/NEBitwiseXor.cpp | 4 ++-- src/runtime/NEON/functions/NEBox3x3.cpp | 6 +++--- src/runtime/NEON/functions/NECannyEdge.cpp | 12 ++++++------ src/runtime/NEON/functions/NEChannelCombine.cpp | 6 +++--- src/runtime/NEON/functions/NEChannelExtract.cpp | 6 +++--- src/runtime/NEON/functions/NEColorConvert.cpp | 10 +++++----- src/runtime/NEON/functions/NEConvolution.cpp | 6 +++--- src/runtime/NEON/functions/NEDepthConcatenate.cpp | 6 +++--- src/runtime/NEON/functions/NEDepthConvert.cpp | 5 +++-- src/runtime/NEON/functions/NEDilate.cpp | 4 ++-- src/runtime/NEON/functions/NEErode.cpp | 4 ++-- src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp | 4 ++-- src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp | 4 ++-- src/runtime/NEON/functions/NEGaussian3x3.cpp | 4 ++-- src/runtime/NEON/functions/NEGaussianPyramid.cpp | 14 +++++++------- src/runtime/NEON/functions/NEHOGDetector.cpp | 4 ++-- src/runtime/NEON/functions/NEHOGGradient.cpp | 6 +++--- src/runtime/NEON/functions/NEHOGMultiDetection.cpp | 15 ++++++++------- src/runtime/NEON/functions/NEHarrisCorners.cpp | 22 +++++++++++----------- src/runtime/NEON/functions/NEHistogram.cpp | 6 +++--- src/runtime/NEON/functions/NEIntegralImage.cpp | 4 ++-- src/runtime/NEON/functions/NELaplacianPyramid.cpp | 6 +++--- .../NEON/functions/NELaplacianReconstruct.cpp | 6 +++--- src/runtime/NEON/functions/NEMagnitude.cpp | 6 +++--- src/runtime/NEON/functions/NEMedian3x3.cpp | 4 ++-- src/runtime/NEON/functions/NENonLinearFilter.cpp | 4 ++-- .../NEON/functions/NENonMaximaSuppression3x3.cpp | 4 ++-- src/runtime/NEON/functions/NEOpticalFlow.cpp | 10 +++++----- src/runtime/NEON/functions/NEPhase.cpp | 4 ++-- .../NEON/functions/NEPixelWiseMultiplication.cpp | 4 ++-- src/runtime/NEON/functions/NEPoolingLayer.cpp | 4 ++-- src/runtime/NEON/functions/NERemap.cpp | 4 ++-- src/runtime/NEON/functions/NEScale.cpp | 3 ++- src/runtime/NEON/functions/NEScharr3x3.cpp | 4 ++-- src/runtime/NEON/functions/NESobel3x3.cpp | 4 ++-- src/runtime/NEON/functions/NETableLookup.cpp | 4 ++-- src/runtime/NEON/functions/NEThreshold.cpp | 4 ++-- src/runtime/NEON/functions/NETranspose.cpp | 4 ++-- src/runtime/NEON/functions/NEWarpAffine.cpp | 7 ++++--- src/runtime/NEON/functions/NEWarpPerspective.cpp | 7 ++++--- 48 files changed, 144 insertions(+), 139 deletions(-) (limited to 'src/runtime/NEON/functions') diff --git a/src/runtime/NEON/functions/NEAbsoluteDifference.cpp b/src/runtime/NEON/functions/NEAbsoluteDifference.cpp index b39feb3a2b..b4620f16dd 100644 --- a/src/runtime/NEON/functions/NEAbsoluteDifference.cpp +++ b/src/runtime/NEON/functions/NEAbsoluteDifference.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEAbsoluteDifference.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEAbsoluteDifferenceKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEAbsoluteDifference::configure(const ITensor *input1, const ITensor *input2, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEAccumulate.cpp b/src/runtime/NEON/functions/NEAccumulate.cpp index c39abfc540..49524d2202 100644 --- a/src/runtime/NEON/functions/NEAccumulate.cpp +++ b/src/runtime/NEON/functions/NEAccumulate.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEAccumulate.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEAccumulateKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEAccumulate::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } @@ -41,13 +41,13 @@ void NEAccumulateWeighted::configure(const ITensor *input, float alpha, ITensor { if(use_fp16) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, alpha, output); _kernel = std::move(k); } else { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, alpha, output); _kernel = std::move(k); } @@ -55,7 +55,7 @@ void NEAccumulateWeighted::configure(const ITensor *input, float alpha, ITensor void NEAccumulateSquared::configure(const ITensor *input, uint32_t shift, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, shift, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEActivationLayer.cpp b/src/runtime/NEON/functions/NEActivationLayer.cpp index 447ae6411b..57a1738f85 100644 --- a/src/runtime/NEON/functions/NEActivationLayer.cpp +++ b/src/runtime/NEON/functions/NEActivationLayer.cpp @@ -23,14 +23,14 @@ */ #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEActivationLayerKernel.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void NEActivationLayer::configure(ITensor *input, ITensor *output, ActivationLayerInfo activation_info) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, activation_info); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEArithmeticAddition.cpp b/src/runtime/NEON/functions/NEArithmeticAddition.cpp index 50cc38b489..11f5aa74e4 100644 --- a/src/runtime/NEON/functions/NEArithmeticAddition.cpp +++ b/src/runtime/NEON/functions/NEArithmeticAddition.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEArithmeticAddition.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEArithmeticAdditionKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEArithmeticAddition::configure(const ITensor *input1, const ITensor *input2, ITensor *output, ConvertPolicy policy) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output, policy); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp b/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp index a3d27c0ed6..37586af751 100644 --- a/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp +++ b/src/runtime/NEON/functions/NEArithmeticSubtraction.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEArithmeticSubtraction.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEArithmeticSubtractionKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEArithmeticSubtraction::configure(const ITensor *input1, const ITensor *input2, ITensor *output, ConvertPolicy policy) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output, policy); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEBitwiseAnd.cpp b/src/runtime/NEON/functions/NEBitwiseAnd.cpp index 5aafc51dc0..79820952bb 100644 --- a/src/runtime/NEON/functions/NEBitwiseAnd.cpp +++ b/src/runtime/NEON/functions/NEBitwiseAnd.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEBitwiseAnd.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEBitwiseAndKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEBitwiseAnd::configure(const ITensor *input1, const ITensor *input2, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEBitwiseNot.cpp b/src/runtime/NEON/functions/NEBitwiseNot.cpp index af3df6e46a..c55957e2b4 100644 --- a/src/runtime/NEON/functions/NEBitwiseNot.cpp +++ b/src/runtime/NEON/functions/NEBitwiseNot.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEBitwiseNot.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEBitwiseNotKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEBitwiseNot::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEBitwiseOr.cpp b/src/runtime/NEON/functions/NEBitwiseOr.cpp index d12c5e5f6f..01036daaef 100644 --- a/src/runtime/NEON/functions/NEBitwiseOr.cpp +++ b/src/runtime/NEON/functions/NEBitwiseOr.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEBitwiseOr.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEBitwiseOrKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEBitwiseOr::configure(const ITensor *input1, const ITensor *input2, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEBitwiseXor.cpp b/src/runtime/NEON/functions/NEBitwiseXor.cpp index 65c943e64c..45916984b0 100644 --- a/src/runtime/NEON/functions/NEBitwiseXor.cpp +++ b/src/runtime/NEON/functions/NEBitwiseXor.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEBitwiseXor.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEBitwiseXorKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEBitwiseXor::configure(const ITensor *input1, const ITensor *input2, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEBox3x3.cpp b/src/runtime/NEON/functions/NEBox3x3.cpp index 7f0b45d34c..46cf259073 100644 --- a/src/runtime/NEON/functions/NEBox3x3.cpp +++ b/src/runtime/NEON/functions/NEBox3x3.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEBox3x3.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEBox3x3Kernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -35,13 +35,13 @@ void NEBox3x3::configure(ITensor *input, ITensor *output, BorderMode border_mode { if(use_fp16) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); } else { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NECannyEdge.cpp b/src/runtime/NEON/functions/NECannyEdge.cpp index 26f31f557b..029d30c5d6 100644 --- a/src/runtime/NEON/functions/NECannyEdge.cpp +++ b/src/runtime/NEON/functions/NECannyEdge.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NECannyEdge.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/NECannyEdgeKernel.h" #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h" @@ -35,6 +34,7 @@ #include "arm_compute/runtime/NEON/functions/NESobel5x5.h" #include "arm_compute/runtime/NEON/functions/NESobel7x7.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" #include #include @@ -85,19 +85,19 @@ void NECannyEdge::configure(ITensor *input, ITensor *output, int32_t upper_thr, // Configure/Init sobelNxN if(gradient_size == 3) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } else if(gradient_size == 5) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } else if(gradient_size == 7) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } @@ -109,13 +109,13 @@ void NECannyEdge::configure(ITensor *input, ITensor *output, int32_t upper_thr, // Configure gradient if(use_fp16) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(&_gx, &_gy, &_magnitude, &_phase, norm_type); _gradient = std::move(k); } else { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(&_gx, &_gy, &_magnitude, &_phase, norm_type); _gradient = std::move(k); } diff --git a/src/runtime/NEON/functions/NEChannelCombine.cpp b/src/runtime/NEON/functions/NEChannelCombine.cpp index 84d4fff4ff..9166aa97db 100644 --- a/src/runtime/NEON/functions/NEChannelCombine.cpp +++ b/src/runtime/NEON/functions/NEChannelCombine.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEChannelCombine.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEChannelCombineKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,14 +32,14 @@ using namespace arm_compute; void NEChannelCombine::configure(const ITensor *plane0, const ITensor *plane1, const ITensor *plane2, const ITensor *plane3, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(plane0, plane1, plane2, plane3, output); _kernel = std::move(k); } void NEChannelCombine::configure(const IImage *plane0, const IImage *plane1, const IImage *plane2, IMultiImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(plane0, plane1, plane2, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEChannelExtract.cpp b/src/runtime/NEON/functions/NEChannelExtract.cpp index 634e918eac..7b8a99335f 100644 --- a/src/runtime/NEON/functions/NEChannelExtract.cpp +++ b/src/runtime/NEON/functions/NEChannelExtract.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEChannelExtract.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEChannelExtractKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,14 +32,14 @@ using namespace arm_compute; void NEChannelExtract::configure(const ITensor *input, Channel channel, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, channel, output); _kernel = std::move(k); } void NEChannelExtract::configure(const IMultiImage *input, Channel channel, IImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, channel, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEColorConvert.cpp b/src/runtime/NEON/functions/NEColorConvert.cpp index bbaa832284..b9fe1ff11d 100644 --- a/src/runtime/NEON/functions/NEColorConvert.cpp +++ b/src/runtime/NEON/functions/NEColorConvert.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEColorConvert.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEColorConvertKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,28 +32,28 @@ using namespace arm_compute; void NEColorConvert::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } void NEColorConvert::configure(const IMultiImage *input, IImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } void NEColorConvert::configure(const IImage *input, IMultiImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } void NEColorConvert::configure(const IMultiImage *input, IMultiImage *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEConvolution.cpp b/src/runtime/NEON/functions/NEConvolution.cpp index 3f39ae2cbd..4ad6450c67 100644 --- a/src/runtime/NEON/functions/NEConvolution.cpp +++ b/src/runtime/NEON/functions/NEConvolution.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NEConvolution.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/NEConvolutionKernel.h" #include "arm_compute/core/PixelValue.h" @@ -33,6 +32,7 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" #include #include @@ -41,7 +41,7 @@ using namespace arm_compute; void NEConvolution3x3::configure(ITensor *input, ITensor *output, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, conv, scale, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); @@ -113,7 +113,7 @@ template class arm_compute::NEConvolutionSquare<9>; void NEConvolutionRectangle::configure(ITensor *input, ITensor *output, const int16_t *conv, uint32_t rows, uint32_t cols, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, conv, rows, cols, scale, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NEDepthConcatenate.cpp b/src/runtime/NEON/functions/NEDepthConcatenate.cpp index 7d2c5494a9..8661fe5fda 100644 --- a/src/runtime/NEON/functions/NEDepthConcatenate.cpp +++ b/src/runtime/NEON/functions/NEDepthConcatenate.cpp @@ -24,13 +24,13 @@ #include "arm_compute/runtime/NEON/functions/NEDepthConcatenate.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/NEDepthConcatenateKernel.h" #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/NEON/NEScheduler.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -44,8 +44,8 @@ void NEDepthConcatenate::configure(std::vector inputs_vector, ITensor ARM_COMPUTE_ERROR_ON(inputs_vector.size() < 2); _num_inputs = inputs_vector.size(); - _concat_kernels_vector = arm_compute::cpp14::make_unique(_num_inputs); - _border_handlers_vector = arm_compute::cpp14::make_unique(_num_inputs); + _concat_kernels_vector = arm_compute::support::cpp14::make_unique(_num_inputs); + _border_handlers_vector = arm_compute::support::cpp14::make_unique(_num_inputs); unsigned int depth_offset = 0; for(unsigned int i = 0; i < _num_inputs; ++i) diff --git a/src/runtime/NEON/functions/NEDepthConvert.cpp b/src/runtime/NEON/functions/NEDepthConvert.cpp index a339cae316..011e366bf3 100644 --- a/src/runtime/NEON/functions/NEDepthConvert.cpp +++ b/src/runtime/NEON/functions/NEDepthConvert.cpp @@ -24,8 +24,9 @@ #include "arm_compute/runtime/NEON/functions/NEDepthConvert.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEDepthConvertKernel.h" +#include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" #include @@ -38,7 +39,7 @@ void NEDepthConvert::configure(const ITensor *input, ITensor *output, ConvertPol ARM_COMPUTE_ERROR_ON(input == output); ARM_COMPUTE_ERROR_ON(input->info()->data_type() == output->info()->data_type()); - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, policy, shift); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEDilate.cpp b/src/runtime/NEON/functions/NEDilate.cpp index 0c016f14f9..5c733a8278 100644 --- a/src/runtime/NEON/functions/NEDilate.cpp +++ b/src/runtime/NEON/functions/NEDilate.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEDilate.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEDilateKernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NEDilate::configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NEErode.cpp b/src/runtime/NEON/functions/NEErode.cpp index 9b011db845..3609572de6 100644 --- a/src/runtime/NEON/functions/NEErode.cpp +++ b/src/runtime/NEON/functions/NEErode.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEErode.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEErodeKernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NEErode::configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp b/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp index 4c77c88656..63f330be6c 100644 --- a/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp +++ b/src/runtime/NEON/functions/NEGEMMInterleave4x4.cpp @@ -23,14 +23,14 @@ */ #include "arm_compute/runtime/NEON/functions/NEGEMMInterleave4x4.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEGEMMInterleave4x4Kernel.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void NEGEMMInterleave4x4::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp b/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp index dc40ecec14..571bf2bc74 100644 --- a/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp +++ b/src/runtime/NEON/functions/NEGEMMTranspose1xW.cpp @@ -24,17 +24,17 @@ #include "arm_compute/runtime/NEON/functions/NEGEMMTranspose1xW.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/NEGEMMTranspose1xWKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void NEGEMMTranspose1xW::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEGaussian3x3.cpp b/src/runtime/NEON/functions/NEGaussian3x3.cpp index 95ba5cbdf9..db8eb63c90 100644 --- a/src/runtime/NEON/functions/NEGaussian3x3.cpp +++ b/src/runtime/NEON/functions/NEGaussian3x3.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEGaussian3x3.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEGaussian3x3Kernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NEGaussian3x3::configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); 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 @@ -68,9 +68,9 @@ void NEGaussianPyramidHalf::configure(const ITensor *input, IPyramid *pyramid, B if(num_levels > 1) { - _border_handler = arm_compute::cpp14::make_unique(num_levels - 1); - _horizontal_reduction = arm_compute::cpp14::make_unique(num_levels - 1); - _vertical_reduction = arm_compute::cpp14::make_unique(num_levels - 1); + _border_handler = arm_compute::support::cpp14::make_unique(num_levels - 1); + _horizontal_reduction = arm_compute::support::cpp14::make_unique(num_levels - 1); + _vertical_reduction = arm_compute::support::cpp14::make_unique(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(num_levels - 1); - _scale_nearest = arm_compute::cpp14::make_unique(num_levels - 1); - _offsets = arm_compute::cpp14::make_unique(num_levels - 1); + _gaus5x5 = arm_compute::support::cpp14::make_unique(num_levels - 1); + _scale_nearest = arm_compute::support::cpp14::make_unique(num_levels - 1); + _offsets = arm_compute::support::cpp14::make_unique(num_levels - 1); PyramidInfo pyramid_info(num_levels - 1, SCALE_PYRAMID_ORB, pyramid->info()->tensor_shape(), Format::U8); _tmp.init(pyramid_info); diff --git a/src/runtime/NEON/functions/NEHOGDetector.cpp b/src/runtime/NEON/functions/NEHOGDetector.cpp index e8ed29d0b9..49d0778eaa 100644 --- a/src/runtime/NEON/functions/NEHOGDetector.cpp +++ b/src/runtime/NEON/functions/NEHOGDetector.cpp @@ -23,14 +23,14 @@ */ #include "arm_compute/runtime/NEON/functions/NEHOGDetector.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEHOGDetectorKernel.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void NEHOGDetector::configure(const ITensor *input, const IHOG *hog, IDetectionWindowArray *detection_windows, const Size2D &detection_window_stride, float threshold, size_t idx_class) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, hog, detection_windows, detection_window_stride, threshold, idx_class); _kernel = std::move(k); } \ No newline at end of file diff --git a/src/runtime/NEON/functions/NEHOGGradient.cpp b/src/runtime/NEON/functions/NEHOGGradient.cpp index 2f4b8802e3..563d4c2640 100644 --- a/src/runtime/NEON/functions/NEHOGGradient.cpp +++ b/src/runtime/NEON/functions/NEHOGGradient.cpp @@ -23,10 +23,10 @@ */ #include "arm_compute/runtime/NEON/functions/NEHOGGradient.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEMagnitudePhaseKernel.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -54,13 +54,13 @@ void NEHOGGradient::configure(ITensor *input, ITensor *output_magnitude, ITensor // Initialise magnitude/phase kernel if(PhaseType::UNSIGNED == phase_type) { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, output_magnitude, output_phase); _mag_phase = std::move(k); } else { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, output_magnitude, output_phase); _mag_phase = std::move(k); } 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); diff --git a/src/runtime/NEON/functions/NEHarrisCorners.cpp b/src/runtime/NEON/functions/NEHarrisCorners.cpp index b54fb67ab7..53b1968db2 100644 --- a/src/runtime/NEON/functions/NEHarrisCorners.cpp +++ b/src/runtime/NEON/functions/NEHarrisCorners.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NEHarrisCorners.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEFillBorderKernel.h" #include "arm_compute/core/NEON/kernels/NEHarrisCornersKernel.h" #include "arm_compute/core/TensorInfo.h" @@ -35,6 +34,7 @@ #include "arm_compute/runtime/NEON/functions/NESobel5x5.h" #include "arm_compute/runtime/NEON/functions/NESobel7x7.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" #include #include @@ -73,28 +73,28 @@ void NEHarrisCorners::configure(IImage *input, float threshold, float min_dist, _score.allocator()->init(tensor_info_score); _nonmax.allocator()->init(tensor_info_score); - _corners_list = arm_compute::cpp14::make_unique(shape.x() * shape.y()); + _corners_list = arm_compute::support::cpp14::make_unique(shape.x() * shape.y()); // Set/init Sobel kernel accordingly with gradient_size switch(gradient_size) { case 3: { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); break; } case 5: { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); break; } case 7: { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); break; @@ -112,21 +112,21 @@ void NEHarrisCorners::configure(IImage *input, float threshold, float min_dist, { case 3: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, &_score, norm_factor, threshold, sensitivity, border_mode == BorderMode::UNDEFINED); _harris_score = std::move(k); } break; case 5: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, &_score, norm_factor, threshold, sensitivity, border_mode == BorderMode::UNDEFINED); _harris_score = std::move(k); } break; case 7: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, &_score, norm_factor, threshold, sensitivity, border_mode == BorderMode::UNDEFINED); _harris_score = std::move(k); } @@ -141,21 +141,21 @@ void NEHarrisCorners::configure(IImage *input, float threshold, float min_dist, { case 3: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, &_score, norm_factor, threshold, sensitivity, border_mode == BorderMode::UNDEFINED); _harris_score = std::move(k); } break; case 5: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, &_score, norm_factor, threshold, sensitivity, border_mode == BorderMode::UNDEFINED); _harris_score = std::move(k); } break; case 7: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(&_gx, &_gy, &_score, norm_factor, threshold, sensitivity, border_mode == BorderMode::UNDEFINED); _harris_score = std::move(k); } diff --git a/src/runtime/NEON/functions/NEHistogram.cpp b/src/runtime/NEON/functions/NEHistogram.cpp index c42b2a56e0..f333ecb1f8 100644 --- a/src/runtime/NEON/functions/NEHistogram.cpp +++ b/src/runtime/NEON/functions/NEHistogram.cpp @@ -24,17 +24,17 @@ #include "arm_compute/runtime/NEON/functions/NEHistogram.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/IDistribution1D.h" #include "arm_compute/core/ITensor.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/NEON/NEScheduler.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; NEHistogram::NEHistogram() - : _histogram_kernel(), _local_hist(), _window_lut(arm_compute::cpp14::make_unique(window_lut_default_size)), _local_hist_size(0) + : _histogram_kernel(), _local_hist(), _window_lut(arm_compute::support::cpp14::make_unique(window_lut_default_size)), _local_hist_size(0) { } @@ -45,7 +45,7 @@ void NEHistogram::configure(const IImage *input, IDistribution1D *output) // Allocate space for threads local histograms _local_hist_size = output->num_bins() * NEScheduler::get().num_threads(); - _local_hist = arm_compute::cpp14::make_unique(_local_hist_size); + _local_hist = arm_compute::support::cpp14::make_unique(_local_hist_size); // Configure kernel _histogram_kernel.configure(input, output, _local_hist.get(), _window_lut.get()); diff --git a/src/runtime/NEON/functions/NEIntegralImage.cpp b/src/runtime/NEON/functions/NEIntegralImage.cpp index af604e9295..2e94ed5f9a 100644 --- a/src/runtime/NEON/functions/NEIntegralImage.cpp +++ b/src/runtime/NEON/functions/NEIntegralImage.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEIntegralImage.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEIntegralImageKernel.h" #include "arm_compute/core/Types.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NEIntegralImage::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); _border_handler.configure(output, _kernel->border_size(), BorderMode::CONSTANT, 0); diff --git a/src/runtime/NEON/functions/NELaplacianPyramid.cpp b/src/runtime/NEON/functions/NELaplacianPyramid.cpp index 8232c79f2d..ec93759869 100644 --- a/src/runtime/NEON/functions/NELaplacianPyramid.cpp +++ b/src/runtime/NEON/functions/NELaplacianPyramid.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NELaplacianPyramid.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/IPyramid.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" @@ -33,6 +32,7 @@ #include "arm_compute/runtime/NEON/functions/NEGaussian5x5.h" #include "arm_compute/runtime/NEON/functions/NEGaussianPyramid.h" #include "arm_compute/runtime/Tensor.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -86,8 +86,8 @@ void NELaplacianPyramid::configure(const ITensor *input, IPyramid *pyramid, ITen // Create Gaussian Pyramid function _gaussian_pyr_function.configure(input, &_gauss_pyr, border_mode, constant_border_value); - _convf = arm_compute::cpp14::make_unique(_num_levels); - _subf = arm_compute::cpp14::make_unique(_num_levels); + _convf = arm_compute::support::cpp14::make_unique(_num_levels); + _subf = arm_compute::support::cpp14::make_unique(_num_levels); for(unsigned int i = 0; i < _num_levels; ++i) { diff --git a/src/runtime/NEON/functions/NELaplacianReconstruct.cpp b/src/runtime/NEON/functions/NELaplacianReconstruct.cpp index 36ac4a74d1..8366e2bfec 100644 --- a/src/runtime/NEON/functions/NELaplacianReconstruct.cpp +++ b/src/runtime/NEON/functions/NELaplacianReconstruct.cpp @@ -24,11 +24,11 @@ #include "arm_compute/runtime/NEON/functions/NELaplacianReconstruct.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/IPyramid.h" #include "arm_compute/core/ITensor.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" #include @@ -61,8 +61,8 @@ void NELaplacianReconstruct::configure(const IPyramid *pyramid, const ITensor *i _tmp_pyr.init(pyramid_info); // Allocate add and scale functions. Level 0 does not need to be scaled. - _addf = arm_compute::cpp14::make_unique(num_levels); - _scalef = arm_compute::cpp14::make_unique(num_levels - 1); + _addf = arm_compute::support::cpp14::make_unique(num_levels); + _scalef = arm_compute::support::cpp14::make_unique(num_levels - 1); const size_t last_level = num_levels - 1; diff --git a/src/runtime/NEON/functions/NEMagnitude.cpp b/src/runtime/NEON/functions/NEMagnitude.cpp index 9390ca2b6a..7877995d6b 100644 --- a/src/runtime/NEON/functions/NEMagnitude.cpp +++ b/src/runtime/NEON/functions/NEMagnitude.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEMagnitude.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEMagnitudePhaseKernel.h" #include "arm_compute/core/Types.h" +#include "support/ToolchainSupport.h" #include @@ -35,13 +35,13 @@ void NEMagnitude::configure(const ITensor *input1, const ITensor *input2, ITenso { if(use_fp16) { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input1, input2, output, nullptr); _kernel = std::move(k); } else { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input1, input2, output, nullptr); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEMedian3x3.cpp b/src/runtime/NEON/functions/NEMedian3x3.cpp index aa7cc97081..627e5fb2a7 100644 --- a/src/runtime/NEON/functions/NEMedian3x3.cpp +++ b/src/runtime/NEON/functions/NEMedian3x3.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEMedian3x3.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEMedian3x3Kernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NEMedian3x3::configure(ITensor *input, ITensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NENonLinearFilter.cpp b/src/runtime/NEON/functions/NENonLinearFilter.cpp index 01aea3b671..57bd4e7aff 100644 --- a/src/runtime/NEON/functions/NENonLinearFilter.cpp +++ b/src/runtime/NEON/functions/NENonLinearFilter.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NENonLinearFilter.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NENonLinearFilterKernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -35,7 +35,7 @@ void NENonLinearFilter::configure(ITensor *input, ITensor *output, NonLinearFilt BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, function, mask_size, pattern, mask, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp b/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp index e92d567d52..3b59820d09 100644 --- a/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp +++ b/src/runtime/NEON/functions/NENonMaximaSuppression3x3.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NENonMaximaSuppression3x3.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NENonMaximaSuppression3x3Kernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NENonMaximaSuppression3x3::configure(ITensor *input, ITensor *output, BorderMode border_mode) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); diff --git a/src/runtime/NEON/functions/NEOpticalFlow.cpp b/src/runtime/NEON/functions/NEOpticalFlow.cpp index 49135e442c..d851e9a62b 100644 --- a/src/runtime/NEON/functions/NEOpticalFlow.cpp +++ b/src/runtime/NEON/functions/NEOpticalFlow.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/NEON/functions/NEOpticalFlow.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/NELKTrackerKernel.h" #include "arm_compute/core/TensorInfo.h" @@ -34,6 +33,7 @@ #include "arm_compute/runtime/Pyramid.h" #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -65,10 +65,10 @@ void NEOpticalFlow::configure(const Pyramid *old_pyramid, const Pyramid *new_pyr const float pyr_scale = old_pyramid->info()->scale(); - _func_scharr = arm_compute::cpp14::make_unique(_num_levels); - _kernel_tracker = 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); + _func_scharr = arm_compute::support::cpp14::make_unique(_num_levels); + _kernel_tracker = 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); _old_points_internal = LKInternalKeypointArray(old_points->num_values()); _new_points_internal = LKInternalKeypointArray(old_points->num_values()); diff --git a/src/runtime/NEON/functions/NEPhase.cpp b/src/runtime/NEON/functions/NEPhase.cpp index 7683f461d3..436d22f3af 100644 --- a/src/runtime/NEON/functions/NEPhase.cpp +++ b/src/runtime/NEON/functions/NEPhase.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEPhase.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEMagnitudePhaseKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEPhase::configure(const ITensor *input1, const ITensor *input2, ITensor *output) { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input1, input2, nullptr, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp b/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp index 056d33b370..2e2ea11e86 100644 --- a/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp +++ b/src/runtime/NEON/functions/NEPixelWiseMultiplication.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEPixelWiseMultiplication.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEPixelWiseMultiplicationKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEPixelWiseMultiplication::configure(const ITensor *input1, const ITensor *input2, ITensor *output, float scale, ConvertPolicy overflow_policy, RoundingPolicy rounding_policy) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input1, input2, output, scale, overflow_policy, rounding_policy); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEPoolingLayer.cpp b/src/runtime/NEON/functions/NEPoolingLayer.cpp index 6f0cc4f160..4c4e11f7db 100644 --- a/src/runtime/NEON/functions/NEPoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEPoolingLayer.cpp @@ -23,15 +23,15 @@ */ #include "arm_compute/runtime/NEON/functions/NEPoolingLayer.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void NEPoolingLayer::configure(ITensor *input, ITensor *output, const PoolingLayerInfo &pool_info) { // Configure pooling kernel - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, pool_info); _kernel = std::move(k); diff --git a/src/runtime/NEON/functions/NERemap.cpp b/src/runtime/NEON/functions/NERemap.cpp index 9f06fb699c..882e93beae 100644 --- a/src/runtime/NEON/functions/NERemap.cpp +++ b/src/runtime/NEON/functions/NERemap.cpp @@ -24,13 +24,13 @@ #include "arm_compute/runtime/NEON/functions/NERemap.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/NERemapKernel.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" #include @@ -44,7 +44,7 @@ void NERemap::configure(ITensor *input, const ITensor *map_x, const ITensor *map ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(map_y, 1, DataType::F32); ARM_COMPUTE_ERROR_ON_MSG(policy == InterpolationPolicy::AREA, "Area interpolation is not supported"); - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, map_x, map_y, output, policy); diff --git a/src/runtime/NEON/functions/NEScale.cpp b/src/runtime/NEON/functions/NEScale.cpp index b70f626df0..0a551e937d 100644 --- a/src/runtime/NEON/functions/NEScale.cpp +++ b/src/runtime/NEON/functions/NEScale.cpp @@ -32,6 +32,7 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Window.h" #include "arm_compute/runtime/TensorAllocator.h" +#include "support/ToolchainSupport.h" #include #include @@ -116,7 +117,7 @@ void NEScale::configure(ITensor *input, ITensor *output, InterpolationPolicy pol policy = InterpolationPolicy::NEAREST_NEIGHBOR; } - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); // Check if the border mode is UNDEFINED const bool border_undefined = border_mode == BorderMode::UNDEFINED; diff --git a/src/runtime/NEON/functions/NEScharr3x3.cpp b/src/runtime/NEON/functions/NEScharr3x3.cpp index 04b3f14ce7..ba9985e1d2 100644 --- a/src/runtime/NEON/functions/NEScharr3x3.cpp +++ b/src/runtime/NEON/functions/NEScharr3x3.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NEScharr3x3.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEScharr3x3Kernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NEScharr3x3::configure(ITensor *input, ITensor *output_x, ITensor *output_y, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output_x, output_y, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NESobel3x3.cpp b/src/runtime/NEON/functions/NESobel3x3.cpp index 3b46fd78c1..753b1f600f 100644 --- a/src/runtime/NEON/functions/NESobel3x3.cpp +++ b/src/runtime/NEON/functions/NESobel3x3.cpp @@ -23,9 +23,9 @@ */ #include "arm_compute/runtime/NEON/functions/NESobel3x3.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NESobel3x3Kernel.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include @@ -33,7 +33,7 @@ using namespace arm_compute; void NESobel3x3::configure(ITensor *input, ITensor *output_x, ITensor *output_y, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output_x, output_y, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/NEON/functions/NETableLookup.cpp b/src/runtime/NEON/functions/NETableLookup.cpp index ebb8a0ac9b..cae117a13e 100644 --- a/src/runtime/NEON/functions/NETableLookup.cpp +++ b/src/runtime/NEON/functions/NETableLookup.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NETableLookup.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NETableLookupKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NETableLookup::configure(const ITensor *input, const ILut *lut, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, lut, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEThreshold.cpp b/src/runtime/NEON/functions/NEThreshold.cpp index 93dc124880..37883e5387 100644 --- a/src/runtime/NEON/functions/NEThreshold.cpp +++ b/src/runtime/NEON/functions/NEThreshold.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NEThreshold.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEThresholdKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NEThreshold::configure(const ITensor *input, ITensor *output, uint8_t threshold, uint8_t false_value, uint8_t true_value, ThresholdType type, uint8_t upper) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, threshold, false_value, true_value, type, upper); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NETranspose.cpp b/src/runtime/NEON/functions/NETranspose.cpp index 53ac9c5ee3..eb81e02205 100644 --- a/src/runtime/NEON/functions/NETranspose.cpp +++ b/src/runtime/NEON/functions/NETranspose.cpp @@ -23,8 +23,8 @@ */ #include "arm_compute/runtime/NEON/functions/NETranspose.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NETransposeKernel.h" +#include "support/ToolchainSupport.h" #include @@ -32,7 +32,7 @@ using namespace arm_compute; void NETranspose::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::cpp14::make_unique(); + auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/NEON/functions/NEWarpAffine.cpp b/src/runtime/NEON/functions/NEWarpAffine.cpp index 24fb16f9e3..889d827ed0 100644 --- a/src/runtime/NEON/functions/NEWarpAffine.cpp +++ b/src/runtime/NEON/functions/NEWarpAffine.cpp @@ -24,8 +24,9 @@ #include "arm_compute/runtime/NEON/functions/NEWarpAffine.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEWarpKernel.h" +#include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" #include @@ -41,14 +42,14 @@ void NEWarpAffine::configure(ITensor *input, ITensor *output, const float *matri { case InterpolationPolicy::NEAREST_NEIGHBOR: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input, output, matrix, border_mode, constant_border_value); _kernel = std::move(k); break; } case InterpolationPolicy::BILINEAR: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input, output, matrix, border_mode, constant_border_value); _kernel = std::move(k); break; diff --git a/src/runtime/NEON/functions/NEWarpPerspective.cpp b/src/runtime/NEON/functions/NEWarpPerspective.cpp index 84b2df5bfa..ed5d6a0d27 100644 --- a/src/runtime/NEON/functions/NEWarpPerspective.cpp +++ b/src/runtime/NEON/functions/NEWarpPerspective.cpp @@ -24,8 +24,9 @@ #include "arm_compute/runtime/NEON/functions/NEWarpPerspective.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/NEON/kernels/NEWarpKernel.h" +#include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" #include @@ -41,14 +42,14 @@ void NEWarpPerspective::configure(ITensor *input, ITensor *output, const float * { case InterpolationPolicy::NEAREST_NEIGHBOR: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input, output, matrix, border_mode, constant_border_value); _kernel = std::move(k); break; } case InterpolationPolicy::BILINEAR: { - auto k = arm_compute::cpp14::make_unique>(); + auto k = arm_compute::support::cpp14::make_unique>(); k->configure(input, output, matrix, border_mode, constant_border_value); _kernel = std::move(k); break; -- cgit v1.2.1