From 40f51a63c8e7258db15269427ae4fe1ad199c550 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Sat, 21 Nov 2020 03:04:18 +0000 Subject: Update default C++ standard to C++14 (3RDPARTY_UPDATE) Resolves: COMPMID-3849 Signed-off-by: Georgios Pinitas Change-Id: I6369f112337310140e2d6c8e79630cd11138dfa0 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4544 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- src/runtime/NEON/functions/NEConvolution.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/runtime/NEON/functions/NEConvolution.cpp') diff --git a/src/runtime/NEON/functions/NEConvolution.cpp b/src/runtime/NEON/functions/NEConvolution.cpp index 07ac8bd42b..680d8f628f 100644 --- a/src/runtime/NEON/functions/NEConvolution.cpp +++ b/src/runtime/NEON/functions/NEConvolution.cpp @@ -34,7 +34,6 @@ #include "src/core/NEON/kernels/NEConvolutionKernel.h" #include "src/core/NEON/kernels/NEConvolutionKernel.h" #include "src/core/NEON/kernels/NEFillBorderKernel.h" -#include "support/MemorySupport.h" #include #include @@ -45,11 +44,11 @@ NEConvolution3x3::~NEConvolution3x3() = default; 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::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(input, output, conv, scale, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); - auto b = arm_compute::support::cpp14::make_unique(); + auto b = std::make_unique(); b->configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); _border_handler = std::move(b); } @@ -76,7 +75,7 @@ void NEConvolutionSquare::configure(ITensor *input, ITensor *output _is_separable = separate_matrix(conv, conv_col.data(), conv_row.data(), matrix_size); - auto b = arm_compute::support::cpp14::make_unique(); + auto b = std::make_unique(); if(_is_separable) { DataType intermediate_type = DataType::UNKNOWN; @@ -93,8 +92,8 @@ void NEConvolutionSquare::configure(ITensor *input, ITensor *output scale = calculate_matrix_scale(conv, matrix_size); } - _kernel_hor = arm_compute::support::cpp14::make_unique>(); - _kernel_vert = arm_compute::support::cpp14::make_unique>(); + _kernel_hor = std::make_unique>(); + _kernel_vert = std::make_unique>(); _kernel_hor->configure(input, &_tmp, conv_row.data(), border_mode == BorderMode::UNDEFINED); _kernel_vert->configure(&_tmp, output, conv_col.data(), scale, border_mode == BorderMode::UNDEFINED); @@ -105,7 +104,7 @@ void NEConvolutionSquare::configure(ITensor *input, ITensor *output } else { - _kernel = arm_compute::support::cpp14::make_unique>(); + _kernel = std::make_unique>(); _kernel->configure(input, output, conv, scale, border_mode == BorderMode::UNDEFINED); b->configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); } @@ -138,11 +137,11 @@ NEConvolutionRectangle::~NEConvolutionRectangle() = default; 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::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(input, output, conv, rows, cols, scale, border_mode == BorderMode::UNDEFINED); _kernel = std::move(k); - auto b = arm_compute::support::cpp14::make_unique(); + auto b = std::make_unique(); b->configure(input, _kernel->border_size(), border_mode, PixelValue(constant_border_value)); _border_handler = std::move(b); } -- cgit v1.2.1