diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-11-21 03:04:18 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-12-01 10:41:54 +0000 |
commit | 40f51a63c8e7258db15269427ae4fe1ad199c550 (patch) | |
tree | 353253a41863966995a45556731e7181a643c003 /src/runtime/CL/functions/CLConvolutionLayer.cpp | |
parent | 327800401c4185d98fcc01b9c9efbc038a4228ed (diff) | |
download | ComputeLibrary-40f51a63c8e7258db15269427ae4fe1ad199c550.tar.gz |
Update default C++ standard to C++14
(3RDPARTY_UPDATE)
Resolves: COMPMID-3849
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I6369f112337310140e2d6c8e79630cd11138dfa0
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4544
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/CL/functions/CLConvolutionLayer.cpp')
-rw-r--r-- | src/runtime/CL/functions/CLConvolutionLayer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/runtime/CL/functions/CLConvolutionLayer.cpp b/src/runtime/CL/functions/CLConvolutionLayer.cpp index e214bdf0f2..edd9298d26 100644 --- a/src/runtime/CL/functions/CLConvolutionLayer.cpp +++ b/src/runtime/CL/functions/CLConvolutionLayer.cpp @@ -29,7 +29,6 @@ #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/core/utils/quantization/AsymmHelpers.h" #include "arm_compute/runtime/CL/CLScheduler.h" -#include "support/MemorySupport.h" #include <cmath> #include <memory> @@ -66,7 +65,7 @@ void CLConvolutionLayer::configure(const CLCompileContext &compile_context, ICLT case ConvolutionMethod::WINOGRAD: { ARM_COMPUTE_ERROR_ON(num_groups != 1); - auto f = arm_compute::support::cpp14::make_unique<CLWinogradConvolutionLayer>(_memory_manager); + auto f = std::make_unique<CLWinogradConvolutionLayer>(_memory_manager); f->configure(compile_context, input, weights, biases, output, conv_info, act_info, enable_fast_math); _function = std::move(f); break; @@ -74,21 +73,21 @@ void CLConvolutionLayer::configure(const CLCompileContext &compile_context, ICLT case ConvolutionMethod::DIRECT: { ARM_COMPUTE_ERROR_ON(num_groups != 1); - auto f = arm_compute::support::cpp14::make_unique<CLDirectConvolutionLayer>(); + auto f = std::make_unique<CLDirectConvolutionLayer>(); f->configure(compile_context, input, weights, biases, output, conv_info, act_info); _function = std::move(f); break; } case ConvolutionMethod::GEMM: { - auto f = arm_compute::support::cpp14::make_unique<CLGEMMConvolutionLayer>(_memory_manager); + auto f = std::make_unique<CLGEMMConvolutionLayer>(_memory_manager); f->configure(compile_context, input, weights, biases, output, conv_info, weights_info, dilation, act_info, num_groups); _function = std::move(f); break; } case ConvolutionMethod::FFT: { - auto f = arm_compute::support::cpp14::make_unique<CLFFTConvolutionLayer>(_memory_manager); + auto f = std::make_unique<CLFFTConvolutionLayer>(_memory_manager); f->configure(compile_context, input, weights, biases, output, conv_info, act_info); _function = std::move(f); break; |