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/GLES_COMPUTE | |
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/GLES_COMPUTE')
19 files changed, 23 insertions, 42 deletions
diff --git a/src/runtime/GLES_COMPUTE/GCBufferAllocator.cpp b/src/runtime/GLES_COMPUTE/GCBufferAllocator.cpp index ec91027915..695331d743 100644 --- a/src/runtime/GLES_COMPUTE/GCBufferAllocator.cpp +++ b/src/runtime/GLES_COMPUTE/GCBufferAllocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -54,6 +54,6 @@ void GCBufferAllocator::free(void *ptr) std::unique_ptr<IMemoryRegion> GCBufferAllocator::make_region(size_t size, size_t alignment) { ARM_COMPUTE_UNUSED(alignment); - return arm_compute::support::cpp14::make_unique<GCBufferMemoryRegion>(size); + return std::make_unique<GCBufferMemoryRegion>(size); } } // namespace arm_compute diff --git a/src/runtime/GLES_COMPUTE/GCRuntimeContext.cpp b/src/runtime/GLES_COMPUTE/GCRuntimeContext.cpp index 6599f5296a..2ed78fe099 100644 --- a/src/runtime/GLES_COMPUTE/GCRuntimeContext.cpp +++ b/src/runtime/GLES_COMPUTE/GCRuntimeContext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Arm Limited. + * Copyright (c) 2019-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -30,7 +30,7 @@ namespace arm_compute { GCRuntimeContext::GCRuntimeContext() - : _gpu_owned_scheduler(support::cpp14::make_unique<GCScheduler>()), + : _gpu_owned_scheduler(std::make_unique<GCScheduler>()), _gpu_scheduler(_gpu_owned_scheduler.get()), _core_context() { diff --git a/src/runtime/GLES_COMPUTE/GCTensorAllocator.cpp b/src/runtime/GLES_COMPUTE/GCTensorAllocator.cpp index ff96c3cb83..b3344d8ecb 100644 --- a/src/runtime/GLES_COMPUTE/GCTensorAllocator.cpp +++ b/src/runtime/GLES_COMPUTE/GCTensorAllocator.cpp @@ -28,7 +28,6 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/runtime/GLES_COMPUTE/GCMemoryRegion.h" #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "support/MemorySupport.h" using namespace arm_compute; @@ -46,7 +45,7 @@ void GCTensorAllocator::allocate() { if(_associated_memory_group == nullptr) { - _memory.set_owned_region(support::cpp14::make_unique<GCBufferMemoryRegion>(info().total_size())); + _memory.set_owned_region(std::make_unique<GCBufferMemoryRegion>(info().total_size())); } else { diff --git a/src/runtime/GLES_COMPUTE/functions/GCAbsoluteDifference.cpp b/src/runtime/GLES_COMPUTE/functions/GCAbsoluteDifference.cpp index 1b13143bde..29630c8981 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCAbsoluteDifference.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCAbsoluteDifference.cpp @@ -26,7 +26,6 @@ #include "arm_compute/core/GLES_COMPUTE/kernels/GCAbsoluteDifferenceKernel.h" #include "arm_compute/core/Helpers.h" -#include "support/MemorySupport.h" #include <utility> @@ -34,7 +33,7 @@ using namespace arm_compute; void GCAbsoluteDifference::configure(const IGCTensor *input1, const IGCTensor *input2, IGCTensor *output) { - auto k = arm_compute::support::cpp14::make_unique<GCAbsoluteDifferenceKernel>(); + auto k = std::make_unique<GCAbsoluteDifferenceKernel>(); k->configure(input1, input2, output); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCActivationLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCActivationLayer.cpp index a7ec758138..b3815f1625 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCActivationLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCActivationLayer.cpp @@ -25,7 +25,6 @@ #include "arm_compute/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.h" #include "arm_compute/core/Helpers.h" -#include "support/MemorySupport.h" namespace arm_compute { @@ -38,7 +37,7 @@ void GCActivationLayer::configure(IGCTensor *input, IGCTensor *output, Activatio { auto core_ctx = _ctx ? _ctx->core_runtime_context() : /* Legacy */ nullptr; - auto k = arm_compute::support::cpp14::make_unique<GCActivationLayerKernel>(core_ctx); + auto k = std::make_unique<GCActivationLayerKernel>(core_ctx); k->configure(input, output, act_info); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCArithmeticAddition.cpp b/src/runtime/GLES_COMPUTE/functions/GCArithmeticAddition.cpp index 580f8d573c..5661a9bfdd 100755 --- a/src/runtime/GLES_COMPUTE/functions/GCArithmeticAddition.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCArithmeticAddition.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/GLES_COMPUTE/functions/GCArithmeticAddition.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCArithmeticAdditionKernel.h" -#include "support/MemorySupport.h" #include <utility> @@ -33,7 +32,7 @@ using namespace arm_compute; void GCArithmeticAddition::configure(const IGCTensor *input1, const IGCTensor *input2, IGCTensor *output, ConvertPolicy policy, const ActivationLayerInfo &act_info) { ARM_COMPUTE_UNUSED(act_info); - auto k = arm_compute::support::cpp14::make_unique<GCArithmeticAdditionKernel>(); + auto k = std::make_unique<GCArithmeticAdditionKernel>(); k->configure(input1, input2, output, policy); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.cpp index 807412eb17..2c21d81e17 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCConcatenateLayer.cpp @@ -31,8 +31,6 @@ #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" #include "src/core/helpers/AutoConfiguration.h" -#include "support/MemorySupport.h" - namespace arm_compute { GCConcatenateLayer::GCConcatenateLayer() @@ -61,7 +59,7 @@ void GCConcatenateLayer::configure(std::vector<IGCTensor *> inputs_vector, IGCTe { for(unsigned int i = 0; i < _num_inputs; ++i) { - auto kernel = support::cpp14::make_unique<GCDepthConcatenateLayerKernel>(); + auto kernel = std::make_unique<GCDepthConcatenateLayerKernel>(); kernel->configure(inputs_vector.at(i), offset, output); offset += inputs_vector.at(i)->info()->dimension(axis); _concat_kernels.emplace_back(std::move(kernel)); diff --git a/src/runtime/GLES_COMPUTE/functions/GCConvolutionLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCConvolutionLayer.cpp index 0d0526d5c9..93a66f012e 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCConvolutionLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Arm Limited. + * Copyright (c) 2017-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -31,7 +31,6 @@ #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" #include <cmath> -#include <memory> #include <tuple> using namespace arm_compute; diff --git a/src/runtime/GLES_COMPUTE/functions/GCDepthwiseConvolutionLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCDepthwiseConvolutionLayer.cpp index 4ddd0ab4ca..46d5cc40d9 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCDepthwiseConvolutionLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCDepthwiseConvolutionLayer.cpp @@ -26,7 +26,6 @@ #include "arm_compute/core/GLES_COMPUTE/IGCTensor.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "support/MemorySupport.h" using namespace arm_compute; @@ -40,7 +39,7 @@ void GCDepthwiseConvolutionLayer3x3::configure(IGCTensor *input, const IGCTensor { ARM_COMPUTE_ERROR_ON(dilation.x() != 1 || dilation.y() != 1); ARM_COMPUTE_UNUSED(dilation); - auto k = arm_compute::support::cpp14::make_unique<GCDepthwiseConvolutionLayer3x3Kernel>(); + auto k = std::make_unique<GCDepthwiseConvolutionLayer3x3Kernel>(); k->configure(input, weights, biases, output, conv_info, depth_multiplier); _kernel = std::move(k); diff --git a/src/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.cpp index c2aa81567e..63c963196a 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCDirectConvolutionLayer.cpp @@ -30,7 +30,6 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Utils.h" #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "support/MemorySupport.h" using namespace arm_compute; @@ -46,19 +45,19 @@ void GCDirectConvolutionLayer::configure(IGCTensor *input, const IGCTensor *weig if(kernel_size == 1) { - auto k = arm_compute::support::cpp14::make_unique<GCDirectConvolutionLayer1x1Kernel>(); + auto k = std::make_unique<GCDirectConvolutionLayer1x1Kernel>(); k->configure(input, weights, biases, output, conv_info, act_info); _kernel = std::move(k); } else if(kernel_size == 3) { - auto k = arm_compute::support::cpp14::make_unique<GCDirectConvolutionLayer3x3Kernel>(); + auto k = std::make_unique<GCDirectConvolutionLayer3x3Kernel>(); k->configure(input, weights, biases, output, conv_info, act_info); _kernel = std::move(k); } else if(kernel_size == 5) { - auto k = arm_compute::support::cpp14::make_unique<GCDirectConvolutionLayer5x5Kernel>(); + auto k = std::make_unique<GCDirectConvolutionLayer5x5Kernel>(); k->configure(input, weights, biases, output, conv_info, act_info); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCFillBorder.cpp b/src/runtime/GLES_COMPUTE/functions/GCFillBorder.cpp index 080b5a22ac..97b4fd946c 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCFillBorder.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCFillBorder.cpp @@ -26,7 +26,6 @@ #include "arm_compute/core/GLES_COMPUTE/kernels/GCFillBorderKernel.h" #include "arm_compute/core/Helpers.h" -#include "support/MemorySupport.h" #include <utility> @@ -34,7 +33,7 @@ using namespace arm_compute; void GCFillBorder::configure(IGCTensor *tensor, unsigned int border_width, BorderMode border_mode, const PixelValue &constant_border_value) { - auto k = arm_compute::support::cpp14::make_unique<GCFillBorderKernel>(); + auto k = std::make_unique<GCFillBorderKernel>(); k->configure(tensor, BorderSize(border_width), border_mode, constant_border_value); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCFullyConnectedLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCFullyConnectedLayer.cpp index 57a09edfd6..299a027b42 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCFullyConnectedLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCFullyConnectedLayer.cpp @@ -25,7 +25,6 @@ #include "arm_compute/core/Validate.h" #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "support/MemorySupport.h" #include <algorithm> @@ -33,7 +32,7 @@ using namespace arm_compute; void GCFullyConnectedLayerReshapeWeights::configure(const IGCTensor *input, IGCTensor *output) { - auto k = arm_compute::support::cpp14::make_unique<GCTransposeKernel>(); + auto k = std::make_unique<GCTransposeKernel>(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCGEMMInterleave4x4.cpp b/src/runtime/GLES_COMPUTE/functions/GCGEMMInterleave4x4.cpp index 1366a134aa..c1287f7e9c 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCGEMMInterleave4x4.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCGEMMInterleave4x4.cpp @@ -24,13 +24,12 @@ #include "arm_compute/runtime/GLES_COMPUTE/functions/GCGEMMInterleave4x4.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCGEMMInterleave4x4Kernel.h" -#include "support/MemorySupport.h" using namespace arm_compute; void GCGEMMInterleave4x4::configure(const IGCTensor *input, IGCTensor *output) { - auto k = arm_compute::support::cpp14::make_unique<GCGEMMInterleave4x4Kernel>(); + auto k = std::make_unique<GCGEMMInterleave4x4Kernel>(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCGEMMTranspose1xW.cpp b/src/runtime/GLES_COMPUTE/functions/GCGEMMTranspose1xW.cpp index 877f81ae9b..d085357eaa 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCGEMMTranspose1xW.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCGEMMTranspose1xW.cpp @@ -26,13 +26,12 @@ #include "arm_compute/core/GLES_COMPUTE/IGCTensor.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCGEMMTranspose1xWKernel.h" #include "arm_compute/core/Types.h" -#include "support/MemorySupport.h" using namespace arm_compute; void GCGEMMTranspose1xW::configure(const IGCTensor *input, IGCTensor *output) { - auto k = arm_compute::support::cpp14::make_unique<GCGEMMTranspose1xWKernel>(); + auto k = std::make_unique<GCGEMMTranspose1xWKernel>(); k->configure(input, output); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCPixelWiseMultiplication.cpp b/src/runtime/GLES_COMPUTE/functions/GCPixelWiseMultiplication.cpp index daf978f3ac..ce50a63e53 100755 --- a/src/runtime/GLES_COMPUTE/functions/GCPixelWiseMultiplication.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCPixelWiseMultiplication.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/GLES_COMPUTE/functions/GCPixelWiseMultiplication.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCPixelWiseMultiplicationKernel.h" -#include "support/MemorySupport.h" #include <utility> @@ -33,7 +32,7 @@ using namespace arm_compute; void GCPixelWiseMultiplication::configure(const IGCTensor *input1, const IGCTensor *input2, IGCTensor *output, float scale, const ActivationLayerInfo &act_info) { ARM_COMPUTE_UNUSED(act_info); - auto k = arm_compute::support::cpp14::make_unique<GCPixelWiseMultiplicationKernel>(); + auto k = std::make_unique<GCPixelWiseMultiplicationKernel>(); k->configure(input1, input2, output, scale); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCPoolingLayer.cpp b/src/runtime/GLES_COMPUTE/functions/GCPoolingLayer.cpp index e4ccabc503..6a71fbebe7 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCPoolingLayer.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCPoolingLayer.cpp @@ -27,8 +27,6 @@ #include "arm_compute/core/GLES_COMPUTE/kernels/GCPoolingLayerKernel.h" #include "arm_compute/runtime/GLES_COMPUTE/GCScheduler.h" -#include "support/MemorySupport.h" - namespace arm_compute { GCPoolingLayer::GCPoolingLayer() @@ -39,7 +37,7 @@ GCPoolingLayer::GCPoolingLayer() void GCPoolingLayer::configure(IGCTensor *input, IGCTensor *output, const PoolingLayerInfo &pool_info, IGCTensor *indices) { // Configure pooling kernel - auto k = arm_compute::support::cpp14::make_unique<GCPoolingLayerKernel>(); + auto k = std::make_unique<GCPoolingLayerKernel>(); k->configure(input, output, pool_info, indices); _kernel = std::move(k); diff --git a/src/runtime/GLES_COMPUTE/functions/GCScale.cpp b/src/runtime/GLES_COMPUTE/functions/GCScale.cpp index dccbe9960d..720006fead 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCScale.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCScale.cpp @@ -27,7 +27,6 @@ #include "arm_compute/core/GLES_COMPUTE/IGCTensor.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCScaleKernel.h" #include "arm_compute/core/Validate.h" -#include "support/MemorySupport.h" namespace arm_compute { @@ -39,7 +38,7 @@ void GCScale::configure(IGCTensor *input, IGCTensor *output, InterpolationPolicy void GCScale::configure(IGCTensor *input, IGCTensor *output, const ScaleKernelInfo &info) { - auto k = arm_compute::support::cpp14::make_unique<GCScaleKernel>(); + auto k = std::make_unique<GCScaleKernel>(); k->configure(input, output, info); _kernel = std::move(k); _border_handler.configure(input, _kernel->border_size(), info.border_mode, info.constant_border_value); diff --git a/src/runtime/GLES_COMPUTE/functions/GCTensorShift.cpp b/src/runtime/GLES_COMPUTE/functions/GCTensorShift.cpp index 4cbd2e3e8e..050dc7e9f5 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCTensorShift.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCTensorShift.cpp @@ -28,13 +28,12 @@ #include "arm_compute/core/Helpers.h" #include "arm_compute/core/PixelValue.h" #include "arm_compute/core/Utils.h" -#include "support/MemorySupport.h" using namespace arm_compute; void GCTensorShift::configure(IGCTensor *input) { - auto k = arm_compute::support::cpp14::make_unique<GCTensorShiftKernel>(); + auto k = std::make_unique<GCTensorShiftKernel>(); k->configure(input); _kernel = std::move(k); } diff --git a/src/runtime/GLES_COMPUTE/functions/GCTranspose.cpp b/src/runtime/GLES_COMPUTE/functions/GCTranspose.cpp index da4471c925..14125e9db2 100644 --- a/src/runtime/GLES_COMPUTE/functions/GCTranspose.cpp +++ b/src/runtime/GLES_COMPUTE/functions/GCTranspose.cpp @@ -24,7 +24,6 @@ #include "arm_compute/runtime/GLES_COMPUTE/functions/GCTranspose.h" #include "arm_compute/core/GLES_COMPUTE/kernels/GCTransposeKernel.h" -#include "support/MemorySupport.h" #include <utility> @@ -32,7 +31,7 @@ using namespace arm_compute; void GCTranspose::configure(const IGCTensor *input, IGCTensor *output) { - auto k = arm_compute::support::cpp14::make_unique<GCTransposeKernel>(); + auto k = std::make_unique<GCTransposeKernel>(); k->configure(input, output); _kernel = std::move(k); } |