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/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h | 8 ++++---- src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h | 6 +++--- .../CLGEMMReshapedOnlyRHSKernelConfiguration.h | 6 +++--- src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp | 10 +++++----- src/core/TensorInfo.cpp | 5 +++-- src/core/utils/logging/Logger.cpp | 9 +++++---- 6 files changed, 23 insertions(+), 21 deletions(-) (limited to 'src/core') diff --git a/src/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h b/src/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h index aecf5a8aa8..65396b1d98 100644 --- a/src/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h +++ b/src/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h @@ -29,7 +29,7 @@ #include "src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationMidgard.h" #include "src/core/CL/gemm/native/CLGEMMNativeKernelConfigurationValhall.h" -#include "support/MemorySupport.h" +#include namespace arm_compute { @@ -50,11 +50,11 @@ public: switch(get_arch_from_target(gpu)) { case GPUTarget::MIDGARD: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); case GPUTarget::BIFROST: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); case GPUTarget::VALHALL: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); default: ARM_COMPUTE_ERROR("Not supported GPU target"); } diff --git a/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h b/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h index 21ccf2d647..2a25dc1893 100644 --- a/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h +++ b/src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h @@ -28,7 +28,7 @@ #include "src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationBifrost.h" #include "src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfigurationValhall.h" -#include "support/MemorySupport.h" +#include namespace arm_compute { @@ -50,9 +50,9 @@ public: { case GPUTarget::MIDGARD: case GPUTarget::BIFROST: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); case GPUTarget::VALHALL: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); default: ARM_COMPUTE_ERROR("Not supported GPU target"); } diff --git a/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h b/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h index 4efe28ce69..96c3045119 100644 --- a/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h +++ b/src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h @@ -28,7 +28,7 @@ #include "src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationBifrost.h" #include "src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfigurationValhall.h" -#include "support/MemorySupport.h" +#include namespace arm_compute { @@ -50,9 +50,9 @@ public: { case GPUTarget::MIDGARD: case GPUTarget::BIFROST: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); case GPUTarget::VALHALL: - return support::cpp14::make_unique(gpu); + return std::make_unique(gpu); default: ARM_COMPUTE_ERROR("Not supported GPU target"); } diff --git a/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp b/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp index 211ebdec90..f5a0b370ab 100644 --- a/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp +++ b/src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp @@ -33,11 +33,11 @@ #include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "src/core/AccessWindowStatic.h" #include "src/core/NEON/kernels/convolution/common/utils.hpp" +#include "src/core/NEON/kernels/convolution/winograd/winograd_layer.hpp" #include "src/core/helpers/AutoConfiguration.h" #include "src/core/helpers/WindowHelpers.h" -#include "support/MemorySupport.h" -#include "src/core/NEON/kernels/convolution/winograd/winograd_layer.hpp" +#include namespace arm_compute { @@ -225,7 +225,7 @@ void NEWinogradLayerTransformWeightsKernel(num_output_channels, num_input_channels); + _transform = std::make_unique(num_output_channels, num_input_channels); Window win; auto win_last = _transform->get_window(); @@ -348,7 +348,7 @@ void NEWinogradLayerTransformInputKernel( + _transform = std::make_unique( KernelRows, KernelCols, num_batches, @@ -492,7 +492,7 @@ void NEWinogradLayerTransformOutputKernel(num_batches, num_rows, num_cols, num_channels, activation); + _transform = std::make_unique(num_batches, num_rows, num_cols, num_channels, activation); Window win; auto win_last = _transform->get_window(); win.set(Window::DimX, Window::Dimension(0, win_last, 1)); diff --git a/src/core/TensorInfo.cpp b/src/core/TensorInfo.cpp index 414c128a27..7b1f9c542a 100644 --- a/src/core/TensorInfo.cpp +++ b/src/core/TensorInfo.cpp @@ -29,7 +29,8 @@ #include "arm_compute/core/TensorInfo.h" #include "arm_compute/core/Validate.h" #include "src/core/helpers/Utils.h" -#include "support/MemorySupport.h" + +#include using namespace arm_compute; @@ -314,7 +315,7 @@ bool TensorInfo::extend_padding(const PaddingSize &padding) std::unique_ptr TensorInfo::clone() const { - return support::cpp14::make_unique(*this); + return std::make_unique(*this); } ITensorInfo &TensorInfo::set_data_type(DataType data_type) diff --git a/src/core/utils/logging/Logger.cpp b/src/core/utils/logging/Logger.cpp index 05c5fa07d0..70b5868da8 100644 --- a/src/core/utils/logging/Logger.cpp +++ b/src/core/utils/logging/Logger.cpp @@ -24,7 +24,8 @@ #include "arm_compute/core/utils/logging/Logger.h" #include "arm_compute/core/Error.h" -#include "support/MemorySupport.h" + +#include using namespace arm_compute::logging; @@ -116,9 +117,9 @@ void Logger::add_decorator(std::unique_ptr decorator) void Logger::set_default_decorators() { - _decorators.emplace_back(support::cpp14::make_unique(_name)); - _decorators.emplace_back(support::cpp14::make_unique()); - _decorators.emplace_back(support::cpp14::make_unique()); + _decorators.emplace_back(std::make_unique(_name)); + _decorators.emplace_back(std::make_unique()); + _decorators.emplace_back(std::make_unique()); } bool Logger::is_loggable(LogLevel log_level) -- cgit v1.2.1