aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGeorgios Pinitas <georgios.pinitas@arm.com>2020-11-21 03:04:18 +0000
committerGeorgios Pinitas <georgios.pinitas@arm.com>2020-12-01 10:41:54 +0000
commit40f51a63c8e7258db15269427ae4fe1ad199c550 (patch)
tree353253a41863966995a45556731e7181a643c003 /src/core
parent327800401c4185d98fcc01b9c9efbc038a4228ed (diff)
downloadComputeLibrary-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/core')
-rw-r--r--src/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h8
-rw-r--r--src/core/CL/gemm/reshaped/CLGEMMReshapedKernelConfiguration.h6
-rw-r--r--src/core/CL/gemm/reshaped_only_rhs/CLGEMMReshapedOnlyRHSKernelConfiguration.h6
-rw-r--r--src/core/NEON/kernels/NEWinogradConvolutionLayerKernel.cpp10
-rw-r--r--src/core/TensorInfo.cpp5
-rw-r--r--src/core/utils/logging/Logger.cpp9
6 files changed, 23 insertions, 21 deletions
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 <memory>
namespace arm_compute
{
@@ -50,11 +50,11 @@ public:
switch(get_arch_from_target(gpu))
{
case GPUTarget::MIDGARD:
- return support::cpp14::make_unique<CLGEMMNativeKernelConfigurationMidgard>(gpu);
+ return std::make_unique<CLGEMMNativeKernelConfigurationMidgard>(gpu);
case GPUTarget::BIFROST:
- return support::cpp14::make_unique<CLGEMMNativeKernelConfigurationBifrost>(gpu);
+ return std::make_unique<CLGEMMNativeKernelConfigurationBifrost>(gpu);
case GPUTarget::VALHALL:
- return support::cpp14::make_unique<CLGEMMNativeKernelConfigurationValhall>(gpu);
+ return std::make_unique<CLGEMMNativeKernelConfigurationValhall>(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 <memory>
namespace arm_compute
{
@@ -50,9 +50,9 @@ public:
{
case GPUTarget::MIDGARD:
case GPUTarget::BIFROST:
- return support::cpp14::make_unique<CLGEMMReshapedKernelConfigurationBifrost>(gpu);
+ return std::make_unique<CLGEMMReshapedKernelConfigurationBifrost>(gpu);
case GPUTarget::VALHALL:
- return support::cpp14::make_unique<CLGEMMReshapedKernelConfigurationValhall>(gpu);
+ return std::make_unique<CLGEMMReshapedKernelConfigurationValhall>(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 <memory>
namespace arm_compute
{
@@ -50,9 +50,9 @@ public:
{
case GPUTarget::MIDGARD:
case GPUTarget::BIFROST:
- return support::cpp14::make_unique<CLGEMMReshapedOnlyRHSKernelConfigurationBifrost>(gpu);
+ return std::make_unique<CLGEMMReshapedOnlyRHSKernelConfigurationBifrost>(gpu);
case GPUTarget::VALHALL:
- return support::cpp14::make_unique<CLGEMMReshapedOnlyRHSKernelConfigurationValhall>(gpu);
+ return std::make_unique<CLGEMMReshapedOnlyRHSKernelConfigurationValhall>(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 <memory>
namespace arm_compute
{
@@ -225,7 +225,7 @@ void NEWinogradLayerTransformWeightsKernel<T, OutputTileRows, OutputTileCols, Ke
_matrix_stride = matrix_stride;
_num_output_channels = num_output_channels;
_num_input_channels = num_input_channels;
- _transform = arm_compute::support::cpp14::make_unique<WeightsTransform>(num_output_channels, num_input_channels);
+ _transform = std::make_unique<WeightsTransform>(num_output_channels, num_input_channels);
Window win;
auto win_last = _transform->get_window();
@@ -348,7 +348,7 @@ void NEWinogradLayerTransformInputKernel<T, OutputTileRows, OutputTileCols, Kern
_padding_bottom = (padding == PADDING_SAME) ? iceildiv(KernelRows - 1, 2) : 0;
_padding_right = (padding == PADDING_SAME) ? iceildiv(KernelCols - 1, 2) : 0;
- _transform = arm_compute::support::cpp14::make_unique<InputTransform>(
+ _transform = std::make_unique<InputTransform>(
KernelRows,
KernelCols,
num_batches,
@@ -492,7 +492,7 @@ void NEWinogradLayerTransformOutputKernel<T, OutputTileRows, OutputTileCols, Ker
_num_cols = num_cols;
_num_channels = num_channels;
// We don't have the biases buffer at this stage as it hasn't been allocated, we pass in nullptr OutputTransform is only used here to compute the window
- _transform = arm_compute::support::cpp14::make_unique<OutputTransform>(num_batches, num_rows, num_cols, num_channels, activation);
+ _transform = std::make_unique<OutputTransform>(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 <memory>
using namespace arm_compute;
@@ -314,7 +315,7 @@ bool TensorInfo::extend_padding(const PaddingSize &padding)
std::unique_ptr<ITensorInfo> TensorInfo::clone() const
{
- return support::cpp14::make_unique<TensorInfo>(*this);
+ return std::make_unique<TensorInfo>(*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 <memory>
using namespace arm_compute::logging;
@@ -116,9 +117,9 @@ void Logger::add_decorator(std::unique_ptr<IDecorator> decorator)
void Logger::set_default_decorators()
{
- _decorators.emplace_back(support::cpp14::make_unique<StringDecorator>(_name));
- _decorators.emplace_back(support::cpp14::make_unique<DateDecorator>());
- _decorators.emplace_back(support::cpp14::make_unique<LogLevelDecorator>());
+ _decorators.emplace_back(std::make_unique<StringDecorator>(_name));
+ _decorators.emplace_back(std::make_unique<DateDecorator>());
+ _decorators.emplace_back(std::make_unique<LogLevelDecorator>());
}
bool Logger::is_loggable(LogLevel log_level)