diff options
Diffstat (limited to 'src/runtime/CL')
48 files changed, 130 insertions, 130 deletions
diff --git a/src/runtime/CL/CLMultiHOG.cpp b/src/runtime/CL/CLMultiHOG.cpp index b9e8739454..88d45acd12 100644 --- a/src/runtime/CL/CLMultiHOG.cpp +++ b/src/runtime/CL/CLMultiHOG.cpp @@ -25,12 +25,12 @@ #include "arm_compute/core/CL/ICLHOG.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; CLMultiHOG::CLMultiHOG(size_t num_models) - : _num_models(num_models), _model(arm_compute::cpp14::make_unique<CLHOG[]>(_num_models)) + : _num_models(num_models), _model(arm_compute::support::cpp14::make_unique<CLHOG[]>(_num_models)) { } diff --git a/src/runtime/CL/CLPyramid.cpp b/src/runtime/CL/CLPyramid.cpp index 41d81ea0f8..865f389f7f 100644 --- a/src/runtime/CL/CLPyramid.cpp +++ b/src/runtime/CL/CLPyramid.cpp @@ -24,10 +24,10 @@ #include "arm_compute/runtime/CL/CLPyramid.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PyramidInfo.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/TensorShape.h" +#include "support/ToolchainSupport.h" #include <array> #include <cmath> @@ -52,7 +52,7 @@ void CLPyramid::init_auto_padding(const PyramidInfo &info) void CLPyramid::internal_init(const PyramidInfo &info, bool auto_padding) { _info = info; - _pyramid = arm_compute::cpp14::make_unique<CLTensor[]>(_info.num_levels()); + _pyramid = arm_compute::support::cpp14::make_unique<CLTensor[]>(_info.num_levels()); size_t w = _info.width(); size_t h = _info.height(); diff --git a/src/runtime/CL/functions/CLAbsoluteDifference.cpp b/src/runtime/CL/functions/CLAbsoluteDifference.cpp index 5097dd4710..5613e6c78d 100644 --- a/src/runtime/CL/functions/CLAbsoluteDifference.cpp +++ b/src/runtime/CL/functions/CLAbsoluteDifference.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLAbsoluteDifference.h" #include "arm_compute/core/CL/kernels/CLAbsoluteDifferenceKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLAbsoluteDifference::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLAbsoluteDifferenceKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLAbsoluteDifferenceKernel>(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLAccumulate.cpp b/src/runtime/CL/functions/CLAccumulate.cpp index 56c519984c..78f25fc015 100644 --- a/src/runtime/CL/functions/CLAccumulate.cpp +++ b/src/runtime/CL/functions/CLAccumulate.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLAccumulate.h" #include "arm_compute/core/CL/kernels/CLAccumulateKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,21 +32,21 @@ using namespace arm_compute; void CLAccumulate::configure(const ICLTensor *input, ICLTensor *accum) { - auto k = arm_compute::cpp14::make_unique<CLAccumulateKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLAccumulateKernel>(); k->configure(input, accum); _kernel = std::move(k); } void CLAccumulateWeighted::configure(const ICLTensor *input, float alpha, ICLTensor *accum) { - auto k = arm_compute::cpp14::make_unique<CLAccumulateWeightedKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLAccumulateWeightedKernel>(); k->configure(input, alpha, accum); _kernel = std::move(k); } void CLAccumulateSquared::configure(const ICLTensor *input, uint32_t shift, ICLTensor *accum) { - auto k = arm_compute::cpp14::make_unique<CLAccumulateSquaredKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLAccumulateSquaredKernel>(); k->configure(input, shift, accum); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLActivationLayer.cpp b/src/runtime/CL/functions/CLActivationLayer.cpp index 0d0da0ca9a..b64739a008 100644 --- a/src/runtime/CL/functions/CLActivationLayer.cpp +++ b/src/runtime/CL/functions/CLActivationLayer.cpp @@ -24,13 +24,13 @@ #include "arm_compute/runtime/CL/functions/CLActivationLayer.h" #include "arm_compute/core/CL/kernels/CLActivationLayerKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void CLActivationLayer::configure(ICLTensor *input, ICLTensor *output, ActivationLayerInfo act_info) { - auto k = arm_compute::cpp14::make_unique<CLActivationLayerKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLActivationLayerKernel>(); k->configure(input, output, act_info); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLArithmeticAddition.cpp b/src/runtime/CL/functions/CLArithmeticAddition.cpp index 36bff4285c..5ca384d6a4 100644 --- a/src/runtime/CL/functions/CLArithmeticAddition.cpp +++ b/src/runtime/CL/functions/CLArithmeticAddition.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLArithmeticAddition.h" #include "arm_compute/core/CL/kernels/CLArithmeticAdditionKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLArithmeticAddition::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output, ConvertPolicy policy) { - auto k = arm_compute::cpp14::make_unique<CLArithmeticAdditionKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLArithmeticAdditionKernel>(); k->configure(input1, input2, output, policy); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLArithmeticSubtraction.cpp b/src/runtime/CL/functions/CLArithmeticSubtraction.cpp index 97f0a1caf4..651f51a24a 100644 --- a/src/runtime/CL/functions/CLArithmeticSubtraction.cpp +++ b/src/runtime/CL/functions/CLArithmeticSubtraction.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLArithmeticSubtraction.h" #include "arm_compute/core/CL/kernels/CLArithmeticSubtractionKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLArithmeticSubtraction::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output, ConvertPolicy policy) { - auto k = arm_compute::cpp14::make_unique<CLArithmeticSubtractionKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLArithmeticSubtractionKernel>(); k->configure(input1, input2, output, policy); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLBitwiseAnd.cpp b/src/runtime/CL/functions/CLBitwiseAnd.cpp index 7c85043206..f8a5a859bd 100644 --- a/src/runtime/CL/functions/CLBitwiseAnd.cpp +++ b/src/runtime/CL/functions/CLBitwiseAnd.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLBitwiseAnd.h" #include "arm_compute/core/CL/kernels/CLBitwiseAndKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLBitwiseAnd::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLBitwiseAndKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLBitwiseAndKernel>(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLBitwiseNot.cpp b/src/runtime/CL/functions/CLBitwiseNot.cpp index 17ae5dea3c..dc002e5cac 100644 --- a/src/runtime/CL/functions/CLBitwiseNot.cpp +++ b/src/runtime/CL/functions/CLBitwiseNot.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLBitwiseNot.h" #include "arm_compute/core/CL/kernels/CLBitwiseNotKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLBitwiseNot::configure(const ICLTensor *input, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLBitwiseNotKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLBitwiseNotKernel>(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLBitwiseOr.cpp b/src/runtime/CL/functions/CLBitwiseOr.cpp index c84a279bae..4a10bb2f36 100644 --- a/src/runtime/CL/functions/CLBitwiseOr.cpp +++ b/src/runtime/CL/functions/CLBitwiseOr.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLBitwiseOr.h" #include "arm_compute/core/CL/kernels/CLBitwiseOrKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLBitwiseOr::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLBitwiseOrKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLBitwiseOrKernel>(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLBitwiseXor.cpp b/src/runtime/CL/functions/CLBitwiseXor.cpp index fd49c7d818..d23622ab01 100644 --- a/src/runtime/CL/functions/CLBitwiseXor.cpp +++ b/src/runtime/CL/functions/CLBitwiseXor.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLBitwiseXor.h" #include "arm_compute/core/CL/kernels/CLBitwiseXorKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLBitwiseXor::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLBitwiseXorKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLBitwiseXorKernel>(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLBox3x3.cpp b/src/runtime/CL/functions/CLBox3x3.cpp index 20d5dae94e..f28be44d72 100644 --- a/src/runtime/CL/functions/CLBox3x3.cpp +++ b/src/runtime/CL/functions/CLBox3x3.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLBox3x3.h" #include "arm_compute/core/CL/kernels/CLBox3x3Kernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLBox3x3::configure(ICLTensor *input, ICLTensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLBox3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLBox3x3Kernel>(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, BorderSize(1), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/CL/functions/CLCannyEdge.cpp b/src/runtime/CL/functions/CLCannyEdge.cpp index 1d018b8347..6c321ad69a 100644 --- a/src/runtime/CL/functions/CLCannyEdge.cpp +++ b/src/runtime/CL/functions/CLCannyEdge.cpp @@ -26,12 +26,12 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/OpenCL.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/functions/CLSobel3x3.h" #include "arm_compute/runtime/CL/functions/CLSobel5x5.h" #include "arm_compute/runtime/CL/functions/CLSobel7x7.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -86,19 +86,19 @@ void CLCannyEdge::configure(ICLTensor *input, ICLTensor *output, int32_t upper_t // Configure/Init sobelNxN if(gradient_size == 3) { - auto k = arm_compute::cpp14::make_unique<CLSobel3x3>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel3x3>(); 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<CLSobel5x5>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel5x5>(); 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<CLSobel7x7>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel7x7>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); } diff --git a/src/runtime/CL/functions/CLChannelCombine.cpp b/src/runtime/CL/functions/CLChannelCombine.cpp index 79a3676bd7..11605cf95e 100644 --- a/src/runtime/CL/functions/CLChannelCombine.cpp +++ b/src/runtime/CL/functions/CLChannelCombine.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLChannelCombine.h" #include "arm_compute/core/CL/kernels/CLChannelCombineKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,14 +32,14 @@ using namespace arm_compute; void CLChannelCombine::configure(const ICLTensor *plane0, const ICLTensor *plane1, const ICLTensor *plane2, const ICLTensor *plane3, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLChannelCombineKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLChannelCombineKernel>(); k->configure(plane0, plane1, plane2, plane3, output); _kernel = std::move(k); } void CLChannelCombine::configure(const ICLImage *plane0, const ICLImage *plane1, const ICLImage *plane2, ICLMultiImage *output) { - auto k = arm_compute::cpp14::make_unique<CLChannelCombineKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLChannelCombineKernel>(); k->configure(plane0, plane1, plane2, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLChannelExtract.cpp b/src/runtime/CL/functions/CLChannelExtract.cpp index 2c6174b9ee..50903826d3 100644 --- a/src/runtime/CL/functions/CLChannelExtract.cpp +++ b/src/runtime/CL/functions/CLChannelExtract.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLChannelExtract.h" #include "arm_compute/core/CL/kernels/CLChannelExtractKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,14 +32,14 @@ using namespace arm_compute; void CLChannelExtract::configure(const ICLTensor *input, Channel channel, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLChannelExtractKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLChannelExtractKernel>(); k->configure(input, channel, output); _kernel = std::move(k); } void CLChannelExtract::configure(const ICLMultiImage *input, Channel channel, ICLImage *output) { - auto k = arm_compute::cpp14::make_unique<CLChannelExtractKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLChannelExtractKernel>(); k->configure(input, channel, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLColorConvert.cpp b/src/runtime/CL/functions/CLColorConvert.cpp index 2fe465aeb8..65f8ac3740 100644 --- a/src/runtime/CL/functions/CLColorConvert.cpp +++ b/src/runtime/CL/functions/CLColorConvert.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLColorConvert.h" #include "arm_compute/core/CL/kernels/CLColorConvertKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,28 +32,28 @@ using namespace arm_compute; void CLColorConvert::configure(const ICLTensor *input, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLColorConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLColorConvertKernel>(); k->configure(input, output); _kernel = std::move(k); } void CLColorConvert::configure(const ICLImage *input, ICLMultiImage *output) { - auto k = arm_compute::cpp14::make_unique<CLColorConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLColorConvertKernel>(); k->configure(input, output); _kernel = std::move(k); } void CLColorConvert::configure(const ICLMultiImage *input, ICLImage *output) { - auto k = arm_compute::cpp14::make_unique<CLColorConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLColorConvertKernel>(); k->configure(input, output); _kernel = std::move(k); } void CLColorConvert::configure(const ICLMultiImage *input, ICLMultiImage *output) { - auto k = arm_compute::cpp14::make_unique<CLColorConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLColorConvertKernel>(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLConvolution.cpp b/src/runtime/CL/functions/CLConvolution.cpp index 21b5d47679..641044451d 100644 --- a/src/runtime/CL/functions/CLConvolution.cpp +++ b/src/runtime/CL/functions/CLConvolution.cpp @@ -26,13 +26,13 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/kernels/CLConvolutionKernel.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Utils.h" #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/ITensorAllocator.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -40,7 +40,7 @@ using namespace arm_compute; void CLConvolution3x3::configure(ICLTensor *input, ICLTensor *output, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLConvolution3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLConvolution3x3Kernel>(); 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)); @@ -107,7 +107,7 @@ template class arm_compute::CLConvolutionSquare<9>; void CLConvolutionRectangle::configure(ICLTensor *input, ICLTensor *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<CLConvolutionRectangleKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLConvolutionRectangleKernel>(); 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/CL/functions/CLDepthConcatenate.cpp b/src/runtime/CL/functions/CLDepthConcatenate.cpp index d967d9865f..34778c6980 100644 --- a/src/runtime/CL/functions/CLDepthConcatenate.cpp +++ b/src/runtime/CL/functions/CLDepthConcatenate.cpp @@ -27,10 +27,10 @@ #include "arm_compute/core/CL/kernels/CLDepthConcatenateKernel.h" #include "arm_compute/core/CL/kernels/CLFillBorderKernel.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/CLScheduler.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -47,8 +47,8 @@ void CLDepthConcatenate::configure(std::vector<ICLTensor *> inputs_vector, ICLTe unsigned int depth_offset = 0; - _concat_kernels_vector = arm_compute::cpp14::make_unique<CLDepthConcatenateKernel[]>(_num_inputs); - _border_handlers_vector = arm_compute::cpp14::make_unique<CLFillBorderKernel[]>(_num_inputs); + _concat_kernels_vector = arm_compute::support::cpp14::make_unique<CLDepthConcatenateKernel[]>(_num_inputs); + _border_handlers_vector = arm_compute::support::cpp14::make_unique<CLFillBorderKernel[]>(_num_inputs); for(unsigned int i = 0; i < _num_inputs; i++) { diff --git a/src/runtime/CL/functions/CLDepthConvert.cpp b/src/runtime/CL/functions/CLDepthConvert.cpp index edcd4928ab..b64d05b8b1 100644 --- a/src/runtime/CL/functions/CLDepthConvert.cpp +++ b/src/runtime/CL/functions/CLDepthConvert.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLDepthConvert.h" #include "arm_compute/core/CL/kernels/CLDepthConvertKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLDepthConvert::configure(const ICLTensor *input, ICLTensor *output, ConvertPolicy policy, uint32_t shift) { - auto k = arm_compute::cpp14::make_unique<CLDepthConvertKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLDepthConvertKernel>(); k->configure(input, output, policy, shift); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLDerivative.cpp b/src/runtime/CL/functions/CLDerivative.cpp index 9357de52f1..ae49996f3e 100644 --- a/src/runtime/CL/functions/CLDerivative.cpp +++ b/src/runtime/CL/functions/CLDerivative.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLDerivative.h" #include "arm_compute/core/CL/kernels/CLDerivativeKernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLDerivative::configure(ICLTensor *input, ICLTensor *output_x, ICLTensor *output_y, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLDerivativeKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLDerivativeKernel>(); k->configure(input, output_x, output_y, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, BorderSize(1), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/CL/functions/CLDilate.cpp b/src/runtime/CL/functions/CLDilate.cpp index 0a4abe30c2..59c5ea5439 100644 --- a/src/runtime/CL/functions/CLDilate.cpp +++ b/src/runtime/CL/functions/CLDilate.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLDilate.h" #include "arm_compute/core/CL/kernels/CLDilateKernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLDilate::configure(ICLTensor *input, ICLTensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLDilateKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLDilateKernel>(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, BorderSize(1), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/CL/functions/CLErode.cpp b/src/runtime/CL/functions/CLErode.cpp index c41371cf9e..eb1f6e4bd8 100644 --- a/src/runtime/CL/functions/CLErode.cpp +++ b/src/runtime/CL/functions/CLErode.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLErode.h" #include "arm_compute/core/CL/kernels/CLErodeKernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLErode::configure(ICLTensor *input, ICLTensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLErodeKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLErodeKernel>(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, BorderSize(1), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/CL/functions/CLFillBorder.cpp b/src/runtime/CL/functions/CLFillBorder.cpp index 172f09da1a..54c096e25d 100644 --- a/src/runtime/CL/functions/CLFillBorder.cpp +++ b/src/runtime/CL/functions/CLFillBorder.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLFillBorder.h" #include "arm_compute/core/CL/kernels/CLFillBorderKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLFillBorder::configure(ICLTensor *tensor, unsigned int border_width, BorderMode border_mode, const PixelValue &constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLFillBorderKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLFillBorderKernel>(); k->configure(tensor, BorderSize(border_width), border_mode, constant_border_value); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLGEMMInterleave4x4.cpp b/src/runtime/CL/functions/CLGEMMInterleave4x4.cpp index 9dc77156ef..45547e4cb6 100644 --- a/src/runtime/CL/functions/CLGEMMInterleave4x4.cpp +++ b/src/runtime/CL/functions/CLGEMMInterleave4x4.cpp @@ -24,13 +24,13 @@ #include "arm_compute/runtime/CL/functions/CLGEMMInterleave4x4.h" #include "arm_compute/core/CL/kernels/CLGEMMInterleave4x4Kernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void CLGEMMInterleave4x4::configure(const ICLTensor *input, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLGEMMInterleave4x4Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLGEMMInterleave4x4Kernel>(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLGEMMTranspose1xW.cpp b/src/runtime/CL/functions/CLGEMMTranspose1xW.cpp index 8f8a19e709..d054e01611 100644 --- a/src/runtime/CL/functions/CLGEMMTranspose1xW.cpp +++ b/src/runtime/CL/functions/CLGEMMTranspose1xW.cpp @@ -25,14 +25,14 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/kernels/CLGEMMTranspose1xWKernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/Types.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void CLGEMMTranspose1xW::configure(const ICLTensor *input, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLGEMMTranspose1xWKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLGEMMTranspose1xWKernel>(); k->configure(input, output); _kernel = std::move(k); }
\ No newline at end of file diff --git a/src/runtime/CL/functions/CLGaussian3x3.cpp b/src/runtime/CL/functions/CLGaussian3x3.cpp index 362a3fe920..7ebabd756d 100644 --- a/src/runtime/CL/functions/CLGaussian3x3.cpp +++ b/src/runtime/CL/functions/CLGaussian3x3.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLGaussian3x3.h" #include "arm_compute/core/CL/kernels/CLGaussian3x3Kernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLGaussian3x3::configure(ICLTensor *input, ICLTensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLGaussian3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLGaussian3x3Kernel>(); 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/CL/functions/CLGaussianPyramid.cpp b/src/runtime/CL/functions/CLGaussianPyramid.cpp index 8a4279e99b..8450d5ee69 100644 --- a/src/runtime/CL/functions/CLGaussianPyramid.cpp +++ b/src/runtime/CL/functions/CLGaussianPyramid.cpp @@ -27,11 +27,11 @@ #include "arm_compute/core/CL/kernels/CLGaussianPyramidKernel.h" #include "arm_compute/core/CL/kernels/CLScaleKernel.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" #include "arm_compute/core/Window.h" +#include "support/ToolchainSupport.h" #include "arm_compute/runtime/CL/CLPyramid.h" #include "arm_compute/runtime/CL/CLScheduler.h" @@ -70,9 +70,9 @@ void CLGaussianPyramidHalf::configure(ICLTensor *input, CLPyramid *pyramid, Bord if(num_levels > 1) { - _border_handler = arm_compute::cpp14::make_unique<CLFillBorderKernel[]>(num_levels - 1); - _horizontal_reduction = arm_compute::cpp14::make_unique<CLGaussianPyramidHorKernel[]>(num_levels - 1); - _vertical_reduction = arm_compute::cpp14::make_unique<CLGaussianPyramidVertKernel[]>(num_levels - 1); + _border_handler = arm_compute::support::cpp14::make_unique<CLFillBorderKernel[]>(num_levels - 1); + _horizontal_reduction = arm_compute::support::cpp14::make_unique<CLGaussianPyramidHorKernel[]>(num_levels - 1); + _vertical_reduction = arm_compute::support::cpp14::make_unique<CLGaussianPyramidVertKernel[]>(num_levels - 1); // Apply half scale to the X dimension of the tensor shape TensorShape tensor_shape = pyramid->info()->tensor_shape(); @@ -141,8 +141,8 @@ void CLGaussianPyramidOrb::configure(ICLTensor *input, CLPyramid *pyramid, Borde if(num_levels > 1) { - _gauss5x5 = arm_compute::cpp14::make_unique<CLGaussian5x5[]>(num_levels - 1); - _scale_nearest = arm_compute::cpp14::make_unique<CLScaleKernel[]>(num_levels - 1); + _gauss5x5 = arm_compute::support::cpp14::make_unique<CLGaussian5x5[]>(num_levels - 1); + _scale_nearest = arm_compute::support::cpp14::make_unique<CLScaleKernel[]>(num_levels - 1); PyramidInfo pyramid_info(num_levels - 1, SCALE_PYRAMID_ORB, pyramid->info()->tensor_shape(), Format::U8); diff --git a/src/runtime/CL/functions/CLHOGMultiDetection.cpp b/src/runtime/CL/functions/CLHOGMultiDetection.cpp index b8f2224ac8..6e864464a4 100644 --- a/src/runtime/CL/functions/CLHOGMultiDetection.cpp +++ b/src/runtime/CL/functions/CLHOGMultiDetection.cpp @@ -25,11 +25,11 @@ #include "arm_compute/core/CL/OpenCL.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/runtime/CL/CLArray.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/CLTensor.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -114,12 +114,12 @@ void CLHOGMultiDetection::configure(ICLTensor *input, const ICLMultiHOG *multi_h _num_block_norm_kernel = input_block_norm.size(); // Number of CLHOGBlockNormalizationKernel kernels to compute _num_hog_detect_kernel = input_hog_detect.size(); // Number of CLHOGDetector functions to compute - _orient_bin_kernel = arm_compute::cpp14::make_unique<CLHOGOrientationBinningKernel[]>(_num_orient_bin_kernel); - _block_norm_kernel = arm_compute::cpp14::make_unique<CLHOGBlockNormalizationKernel[]>(_num_block_norm_kernel); - _hog_detect_kernel = arm_compute::cpp14::make_unique<CLHOGDetector[]>(_num_hog_detect_kernel); - _non_maxima_kernel = arm_compute::cpp14::make_unique<CPPDetectionWindowNonMaximaSuppressionKernel>(); - _hog_space = arm_compute::cpp14::make_unique<CLTensor[]>(_num_orient_bin_kernel); - _hog_norm_space = arm_compute::cpp14::make_unique<CLTensor[]>(_num_block_norm_kernel); + _orient_bin_kernel = arm_compute::support::cpp14::make_unique<CLHOGOrientationBinningKernel[]>(_num_orient_bin_kernel); + _block_norm_kernel = arm_compute::support::cpp14::make_unique<CLHOGBlockNormalizationKernel[]>(_num_block_norm_kernel); + _hog_detect_kernel = arm_compute::support::cpp14::make_unique<CLHOGDetector[]>(_num_hog_detect_kernel); + _non_maxima_kernel = arm_compute::support::cpp14::make_unique<CPPDetectionWindowNonMaximaSuppressionKernel>(); + _hog_space = arm_compute::support::cpp14::make_unique<CLTensor[]>(_num_orient_bin_kernel); + _hog_norm_space = arm_compute::support::cpp14::make_unique<CLTensor[]>(_num_block_norm_kernel); // Allocate tensors for magnitude and phase TensorInfo info_mag(shape_img, Format::S16); diff --git a/src/runtime/CL/functions/CLHarrisCorners.cpp b/src/runtime/CL/functions/CLHarrisCorners.cpp index e1c44416ae..87d573a7ad 100644 --- a/src/runtime/CL/functions/CLHarrisCorners.cpp +++ b/src/runtime/CL/functions/CLHarrisCorners.cpp @@ -27,7 +27,6 @@ #include "arm_compute/core/CL/kernels/CLFillBorderKernel.h" #include "arm_compute/core/CL/kernels/CLHarrisCornersKernel.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/CL/CLScheduler.h" @@ -36,6 +35,7 @@ #include "arm_compute/runtime/CL/functions/CLSobel7x7.h" #include "arm_compute/runtime/ITensorAllocator.h" #include "arm_compute/runtime/Scheduler.h" +#include "support/ToolchainSupport.h" #include <cmath> #include <utility> @@ -69,28 +69,28 @@ void CLHarrisCorners::configure(ICLImage *input, float threshold, float min_dist _score.allocator()->init(info_f32); _nonmax.allocator()->init(info_f32); - _corners_list = arm_compute::cpp14::make_unique<InternalKeypoint[]>(shape.x() * shape.y()); + _corners_list = arm_compute::support::cpp14::make_unique<InternalKeypoint[]>(shape.x() * shape.y()); /* Set/init Sobel kernel accordingly with gradient_size */ switch(gradient_size) { case 3: { - auto k = arm_compute::cpp14::make_unique<CLSobel3x3>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel3x3>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); break; } case 5: { - auto k = arm_compute::cpp14::make_unique<CLSobel5x5>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel5x5>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); break; } case 7: { - auto k = arm_compute::cpp14::make_unique<CLSobel7x7>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel7x7>(); k->configure(input, &_gx, &_gy, border_mode, constant_border_value); _sobel = std::move(k); break; diff --git a/src/runtime/CL/functions/CLLaplacianPyramid.cpp b/src/runtime/CL/functions/CLLaplacianPyramid.cpp index d7ce20653d..3fc93426ee 100644 --- a/src/runtime/CL/functions/CLLaplacianPyramid.cpp +++ b/src/runtime/CL/functions/CLLaplacianPyramid.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/CL/functions/CLLaplacianPyramid.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/CL/functions/CLDepthConvert.h" #include "arm_compute/runtime/CL/functions/CLGaussian5x5.h" #include "arm_compute/runtime/CL/functions/CLGaussianPyramid.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -64,8 +64,8 @@ void CLLaplacianPyramid::configure(ICLTensor *input, CLPyramid *pyramid, ICLTens // Create Gaussian Pyramid function _gaussian_pyr_function.configure(input, &_gauss_pyr, border_mode, constant_border_value); - _convf = arm_compute::cpp14::make_unique<CLGaussian5x5[]>(_num_levels); - _subf = arm_compute::cpp14::make_unique<CLArithmeticSubtraction[]>(_num_levels); + _convf = arm_compute::support::cpp14::make_unique<CLGaussian5x5[]>(_num_levels); + _subf = arm_compute::support::cpp14::make_unique<CLArithmeticSubtraction[]>(_num_levels); for(unsigned int i = 0; i < _num_levels; ++i) { diff --git a/src/runtime/CL/functions/CLLaplacianReconstruct.cpp b/src/runtime/CL/functions/CLLaplacianReconstruct.cpp index 1dfab740d7..7fd2273230 100644 --- a/src/runtime/CL/functions/CLLaplacianReconstruct.cpp +++ b/src/runtime/CL/functions/CLLaplacianReconstruct.cpp @@ -24,11 +24,11 @@ #include "arm_compute/runtime/CL/functions/CLLaplacianReconstruct.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 <cstddef> @@ -60,8 +60,8 @@ void CLLaplacianReconstruct::configure(const CLPyramid *pyramid, const ICLTensor _tmp_pyr.init(pyramid_info); // Allocate add and scale functions. Level 0 does not need to be scaled. - _addf = arm_compute::cpp14::make_unique<CLArithmeticAddition[]>(num_levels); - _scalef = arm_compute::cpp14::make_unique<CLScale[]>(num_levels - 1); + _addf = arm_compute::support::cpp14::make_unique<CLArithmeticAddition[]>(num_levels); + _scalef = arm_compute::support::cpp14::make_unique<CLScale[]>(num_levels - 1); const size_t last_level = num_levels - 1; diff --git a/src/runtime/CL/functions/CLMagnitude.cpp b/src/runtime/CL/functions/CLMagnitude.cpp index 51088cb71f..68b8c3545a 100644 --- a/src/runtime/CL/functions/CLMagnitude.cpp +++ b/src/runtime/CL/functions/CLMagnitude.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLMagnitude.h" #include "arm_compute/core/CL/kernels/CLMagnitudePhaseKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLMagnitude::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output, MagnitudeType mag_type) { - auto k = arm_compute::cpp14::make_unique<CLMagnitudePhaseKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLMagnitudePhaseKernel>(); k->configure(input1, input2, output, nullptr, mag_type); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLMedian3x3.cpp b/src/runtime/CL/functions/CLMedian3x3.cpp index 0c10f9aa08..55f9eaa907 100644 --- a/src/runtime/CL/functions/CLMedian3x3.cpp +++ b/src/runtime/CL/functions/CLMedian3x3.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLMedian3x3.h" #include "arm_compute/core/CL/kernels/CLMedian3x3Kernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLMedian3x3::configure(ICLTensor *input, ICLTensor *output, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLMedian3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLMedian3x3Kernel>(); 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/CL/functions/CLNonLinearFilter.cpp b/src/runtime/CL/functions/CLNonLinearFilter.cpp index b593a6cced..d37412f47f 100644 --- a/src/runtime/CL/functions/CLNonLinearFilter.cpp +++ b/src/runtime/CL/functions/CLNonLinearFilter.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLNonLinearFilter.h" #include "arm_compute/core/CL/kernels/CLNonLinearFilterKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLNonLinearFilter::configure(ICLTensor *input, ICLTensor *output, NonLinearFilterFunction function, unsigned int mask_size, MatrixPattern pattern, const uint8_t *mask, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLNonLinearFilterKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLNonLinearFilterKernel>(); 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/CL/functions/CLNonMaximaSuppression3x3.cpp b/src/runtime/CL/functions/CLNonMaximaSuppression3x3.cpp index ca7d5aede7..c0a0cef885 100644 --- a/src/runtime/CL/functions/CLNonMaximaSuppression3x3.cpp +++ b/src/runtime/CL/functions/CLNonMaximaSuppression3x3.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLNonMaximaSuppression3x3.h" #include "arm_compute/core/CL/kernels/CLNonMaximaSuppression3x3Kernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLNonMaximaSuppression3x3::configure(ICLTensor *input, ICLTensor *output, BorderMode border_mode) { - auto k = arm_compute::cpp14::make_unique<CLNonMaximaSuppression3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLNonMaximaSuppression3x3Kernel>(); k->configure(input, output, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); 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<CLLKTrackerInitKernel[]>(_num_levels); - _tracker_stage0_kernel = arm_compute::cpp14::make_unique<CLLKTrackerStage0Kernel[]>(_num_levels); - _tracker_stage1_kernel = arm_compute::cpp14::make_unique<CLLKTrackerStage1Kernel[]>(_num_levels); - _func_scharr = arm_compute::cpp14::make_unique<CLScharr3x3[]>(_num_levels); - _scharr_gx = arm_compute::cpp14::make_unique<CLTensor[]>(_num_levels); - _scharr_gy = arm_compute::cpp14::make_unique<CLTensor[]>(_num_levels); + _tracker_init_kernel = arm_compute::support::cpp14::make_unique<CLLKTrackerInitKernel[]>(_num_levels); + _tracker_stage0_kernel = arm_compute::support::cpp14::make_unique<CLLKTrackerStage0Kernel[]>(_num_levels); + _tracker_stage1_kernel = arm_compute::support::cpp14::make_unique<CLLKTrackerStage1Kernel[]>(_num_levels); + _func_scharr = arm_compute::support::cpp14::make_unique<CLScharr3x3[]>(_num_levels); + _scharr_gx = arm_compute::support::cpp14::make_unique<CLTensor[]>(_num_levels); + _scharr_gy = arm_compute::support::cpp14::make_unique<CLTensor[]>(_num_levels); // Create internal keypoint arrays - _old_points_internal = arm_compute::cpp14::make_unique<CLLKInternalKeypointArray>(list_length); + _old_points_internal = arm_compute::support::cpp14::make_unique<CLLKInternalKeypointArray>(list_length); _old_points_internal->resize(list_length); - _new_points_internal = arm_compute::cpp14::make_unique<CLLKInternalKeypointArray>(list_length); + _new_points_internal = arm_compute::support::cpp14::make_unique<CLLKInternalKeypointArray>(list_length); _new_points_internal->resize(list_length); - _coefficient_table = arm_compute::cpp14::make_unique<CLCoefficientTableArray>(list_length); + _coefficient_table = arm_compute::support::cpp14::make_unique<CLCoefficientTableArray>(list_length); _coefficient_table->resize(list_length); - _old_values = arm_compute::cpp14::make_unique<CLOldValueArray>(old_values_list_length); + _old_values = arm_compute::support::cpp14::make_unique<CLOldValueArray>(old_values_list_length); _old_values->resize(old_values_list_length); _new_points->resize(list_length); diff --git a/src/runtime/CL/functions/CLPhase.cpp b/src/runtime/CL/functions/CLPhase.cpp index a8cb22b06e..cf3fa7e7fb 100644 --- a/src/runtime/CL/functions/CLPhase.cpp +++ b/src/runtime/CL/functions/CLPhase.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLPhase.h" #include "arm_compute/core/CL/kernels/CLMagnitudePhaseKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLPhase::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output, PhaseType phase_type) { - auto k = arm_compute::cpp14::make_unique<CLMagnitudePhaseKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLMagnitudePhaseKernel>(); k->configure(input1, input2, nullptr, output, MagnitudeType::L1NORM, phase_type); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp b/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp index 8a86c2e203..139d466b39 100644 --- a/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp +++ b/src/runtime/CL/functions/CLPixelWiseMultiplication.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLPixelWiseMultiplication.h" #include "arm_compute/core/CL/kernels/CLPixelWiseMultiplicationKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLPixelWiseMultiplication::configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output, float scale, ConvertPolicy overflow_policy, RoundingPolicy rounding_policy) { - auto k = arm_compute::cpp14::make_unique<CLPixelWiseMultiplicationKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLPixelWiseMultiplicationKernel>(); k->configure(input1, input2, output, scale, overflow_policy, rounding_policy); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLPoolingLayer.cpp b/src/runtime/CL/functions/CLPoolingLayer.cpp index 1ef70f4a2b..2cb7d63aa8 100644 --- a/src/runtime/CL/functions/CLPoolingLayer.cpp +++ b/src/runtime/CL/functions/CLPoolingLayer.cpp @@ -24,14 +24,14 @@ #include "arm_compute/runtime/CL/functions/CLPoolingLayer.h" #include "arm_compute/core/CL/kernels/CLPoolingLayerKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; void CLPoolingLayer::configure(ICLTensor *input, ICLTensor *output, const PoolingLayerInfo &pool_info) { // Configure pooling kernel - auto k = arm_compute::cpp14::make_unique<CLPoolingLayerKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLPoolingLayerKernel>(); k->configure(input, output, pool_info); _kernel = std::move(k); diff --git a/src/runtime/CL/functions/CLRemap.cpp b/src/runtime/CL/functions/CLRemap.cpp index f6b1713c58..bc3fd4ed53 100644 --- a/src/runtime/CL/functions/CLRemap.cpp +++ b/src/runtime/CL/functions/CLRemap.cpp @@ -26,10 +26,10 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/kernels/CLRemapKernel.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -43,7 +43,7 @@ void CLRemap::configure(ICLTensor *input, const ICLTensor *map_x, const ICLTenso 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<CLRemapKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLRemapKernel>(); k->configure(input, map_x, map_y, output, policy, 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/CL/functions/CLScale.cpp b/src/runtime/CL/functions/CLScale.cpp index 043f873028..05522b4af5 100644 --- a/src/runtime/CL/functions/CLScale.cpp +++ b/src/runtime/CL/functions/CLScale.cpp @@ -26,8 +26,8 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/kernels/CLScaleKernel.h" #include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/Validate.h" +#include "support/ToolchainSupport.h" using namespace arm_compute; @@ -38,7 +38,7 @@ void CLScale::configure(ICLTensor *input, ICLTensor *output, InterpolationPolicy ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::U8, DataType::S16); ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); - auto k = arm_compute::cpp14::make_unique<CLScaleKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLScaleKernel>(); k->configure(input, output, policy, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, constant_border_value); diff --git a/src/runtime/CL/functions/CLScharr3x3.cpp b/src/runtime/CL/functions/CLScharr3x3.cpp index c8bc465be6..73f8673e78 100644 --- a/src/runtime/CL/functions/CLScharr3x3.cpp +++ b/src/runtime/CL/functions/CLScharr3x3.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLScharr3x3.h" #include "arm_compute/core/CL/kernels/CLScharr3x3Kernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLScharr3x3::configure(ICLTensor *input, ICLTensor *output_x, ICLTensor *output_y, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLScharr3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLScharr3x3Kernel>(); 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/CL/functions/CLSobel3x3.cpp b/src/runtime/CL/functions/CLSobel3x3.cpp index 6b74ebaedb..e227e58bb2 100644 --- a/src/runtime/CL/functions/CLSobel3x3.cpp +++ b/src/runtime/CL/functions/CLSobel3x3.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLSobel3x3.h" #include "arm_compute/core/CL/kernels/CLSobel3x3Kernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLSobel3x3::configure(ICLTensor *input, ICLTensor *output_x, ICLTensor *output_y, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLSobel3x3Kernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLSobel3x3Kernel>(); 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/CL/functions/CLTableLookup.cpp b/src/runtime/CL/functions/CLTableLookup.cpp index 743ed5e73e..d18765093f 100644 --- a/src/runtime/CL/functions/CLTableLookup.cpp +++ b/src/runtime/CL/functions/CLTableLookup.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLTableLookup.h" #include "arm_compute/core/CL/kernels/CLTableLookupKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLTableLookup::configure(const ICLTensor *input, const ICLLut *lut, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLTableLookupKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLTableLookupKernel>(); k->configure(input, lut, output); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLThreshold.cpp b/src/runtime/CL/functions/CLThreshold.cpp index e70f932d66..1b30b77f1d 100644 --- a/src/runtime/CL/functions/CLThreshold.cpp +++ b/src/runtime/CL/functions/CLThreshold.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLThreshold.h" #include "arm_compute/core/CL/kernels/CLThresholdKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLThreshold::configure(const ICLTensor *input, ICLTensor *output, uint8_t threshold, uint8_t false_value, uint8_t true_value, ThresholdType type, uint8_t upper) { - auto k = arm_compute::cpp14::make_unique<CLThresholdKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLThresholdKernel>(); k->configure(input, output, threshold, false_value, true_value, type, upper); _kernel = std::move(k); } diff --git a/src/runtime/CL/functions/CLTranspose.cpp b/src/runtime/CL/functions/CLTranspose.cpp index d802b4fe77..cd19e255bd 100644 --- a/src/runtime/CL/functions/CLTranspose.cpp +++ b/src/runtime/CL/functions/CLTranspose.cpp @@ -24,7 +24,7 @@ #include "arm_compute/runtime/CL/functions/CLTranspose.h" #include "arm_compute/core/CL/kernels/CLTransposeKernel.h" -#include "arm_compute/core/Helpers.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -32,7 +32,7 @@ using namespace arm_compute; void CLTranspose::configure(const ICLTensor *input, ICLTensor *output) { - auto k = arm_compute::cpp14::make_unique<CLTransposeKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLTransposeKernel>(); k->configure(input, output); _kernel = std::move(k); }
\ No newline at end of file diff --git a/src/runtime/CL/functions/CLWarpAffine.cpp b/src/runtime/CL/functions/CLWarpAffine.cpp index 537e0d9397..f785c75a72 100644 --- a/src/runtime/CL/functions/CLWarpAffine.cpp +++ b/src/runtime/CL/functions/CLWarpAffine.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLWarpAffine.h" #include "arm_compute/core/CL/kernels/CLWarpAffineKernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLWarpAffine::configure(ICLTensor *input, ICLTensor *output, const float *matrix, InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLWarpAffineKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLWarpAffineKernel>(); k->configure(input, output, matrix, policy); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); diff --git a/src/runtime/CL/functions/CLWarpPerspective.cpp b/src/runtime/CL/functions/CLWarpPerspective.cpp index a552ab480d..b445b3b9c5 100644 --- a/src/runtime/CL/functions/CLWarpPerspective.cpp +++ b/src/runtime/CL/functions/CLWarpPerspective.cpp @@ -24,8 +24,8 @@ #include "arm_compute/runtime/CL/functions/CLWarpPerspective.h" #include "arm_compute/core/CL/kernels/CLWarpPerspectiveKernel.h" -#include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" +#include "support/ToolchainSupport.h" #include <utility> @@ -33,7 +33,7 @@ using namespace arm_compute; void CLWarpPerspective::configure(ICLTensor *input, ICLTensor *output, const float *matrix, InterpolationPolicy policy, BorderMode border_mode, uint8_t constant_border_value) { - auto k = arm_compute::cpp14::make_unique<CLWarpPerspectiveKernel>(); + auto k = arm_compute::support::cpp14::make_unique<CLWarpPerspectiveKernel>(); k->configure(input, output, matrix, policy); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); |