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>
diff --git a/arm_compute/graph/Graph.h b/arm_compute/graph/Graph.h
index 0cdd8f8..d8d3feb 100644
--- a/arm_compute/graph/Graph.h
+++ b/arm_compute/graph/Graph.h
@@ -238,7 +238,7 @@
// Create node
NodeID nid = _nodes.size();
- auto node = support::cpp14::make_unique<NT>(std::forward<Ts>(args)...);
+ auto node = std::make_unique<NT>(std::forward<Ts>(args)...);
node->set_graph(this);
node->set_id(nid);
diff --git a/arm_compute/graph/TensorDescriptor.h b/arm_compute/graph/TensorDescriptor.h
index de67289..5fa155e 100644
--- a/arm_compute/graph/TensorDescriptor.h
+++ b/arm_compute/graph/TensorDescriptor.h
@@ -27,7 +27,6 @@
#include "arm_compute/graph/Types.h"
#include "support/ICloneable.h"
-#include "support/MemorySupport.h"
#include <memory>
@@ -104,7 +103,7 @@
// Inherited methods overridden:
std::unique_ptr<TensorDescriptor> clone() const override
{
- return support::cpp14::make_unique<TensorDescriptor>(*this);
+ return std::make_unique<TensorDescriptor>(*this);
}
TensorShape shape{}; /**< Tensor shape */
diff --git a/arm_compute/graph/backends/BackendRegistry.h b/arm_compute/graph/backends/BackendRegistry.h
index c4414a2..7c11d35 100644
--- a/arm_compute/graph/backends/BackendRegistry.h
+++ b/arm_compute/graph/backends/BackendRegistry.h
@@ -26,7 +26,6 @@
#include "arm_compute/graph/IDeviceBackend.h"
#include "arm_compute/graph/Types.h"
-#include "support/MemorySupport.h"
#include <map>
#include <memory>
@@ -93,7 +92,7 @@
template <typename T>
inline void BackendRegistry::add_backend(Target target)
{
- _registered_backends[target] = support::cpp14::make_unique<T>();
+ _registered_backends[target] = std::make_unique<T>();
}
} // namespace backends
} // namespace graph
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index e2904af..05bd483 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -113,7 +113,7 @@
const ActivationLayerInfo act_info = node.activation_info();
// Create function
- auto func = support::cpp14::make_unique<ActivationLayerFunction>();
+ auto func = std::make_unique<ActivationLayerFunction>();
func->configure(input, output, act_info);
ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated "
@@ -152,7 +152,7 @@
unsigned int axis = node.axis();
// Create function
- auto func = support::cpp14::make_unique<ArgMinMaxLayerFunction>();
+ auto func = std::make_unique<ArgMinMaxLayerFunction>();
func->configure(input, axis, output, op);
ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated "
@@ -194,7 +194,7 @@
const ActivationLayerInfo fused_act = node.fused_activation();
// Create and configure function
- auto func = support::cpp14::make_unique<BatchNormalizationLayerFunction>();
+ auto func = std::make_unique<BatchNormalizationLayerFunction>();
func->configure(input, output, mean, var, beta, gamma, epsilon, fused_act);
// Log info
@@ -346,7 +346,7 @@
const BoundingBoxTransformInfo bbox_info = node.info();
// Create and configure function
- auto func = support::cpp14::make_unique<BoundingBoxTransformLayerFunction>();
+ auto func = std::make_unique<BoundingBoxTransformLayerFunction>();
func->configure(input, output, deltas, bbox_info);
// Log info
@@ -383,7 +383,7 @@
const unsigned int num_groups = node.num_groups();
// Create function
- auto func = support::cpp14::make_unique<ChannelShuffleLayerFunction>();
+ auto func = std::make_unique<ChannelShuffleLayerFunction>();
func->configure(input, output, num_groups);
ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated "
@@ -430,7 +430,7 @@
const size_t concat_axis = get_dimension_idx(data_layout, node.concatenation_axis());
// Create and configure function
- auto func = support::cpp14::make_unique<ConcatenateLayerFunction>();
+ auto func = std::make_unique<ConcatenateLayerFunction>();
func->configure(inputs, output, concat_axis);
// Log info
@@ -673,7 +673,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<DepthToSpaceLayerFunction>();
+ auto func = std::make_unique<DepthToSpaceLayerFunction>();
func->configure(input, output, node.block_shape());
// Log info
@@ -712,7 +712,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<DequantizationLayerFunction>();
+ auto func = std::make_unique<DequantizationLayerFunction>();
func->configure(input, output);
// Log info
@@ -755,7 +755,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<DetectionOutputLayerFunction>();
+ auto func = std::make_unique<DetectionOutputLayerFunction>();
func->configure(input0, input1, input2, output, detect_info);
// Log info
@@ -807,7 +807,7 @@
ARM_COMPUTE_ERROR_ON(output3 == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<DetectionPostProcessLayerFunction>();
+ auto func = std::make_unique<DetectionPostProcessLayerFunction>();
func->configure(input0, input1, input2, output0, output1, output2, output3, detect_info);
// Log info
@@ -968,7 +968,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<FlattenLayerFunction>();
+ auto func = std::make_unique<FlattenLayerFunction>();
func->configure(input, output);
// Log info
@@ -1013,7 +1013,7 @@
// Create and configure function
auto wm = get_weights_manager(ctx, TargetInfo::TargetType);
auto mm = get_memory_manager(ctx, TargetInfo::TargetType);
- auto func = support::cpp14::make_unique<FullyConnectedLayerFunction>(mm, wm.get());
+ auto func = std::make_unique<FullyConnectedLayerFunction>(mm, wm.get());
func->configure(input, weights, biases, output, fc_info);
const bool is_quantized = is_data_type_quantized_asymmetric(input->info()->data_type());
@@ -1071,7 +1071,7 @@
ARM_COMPUTE_ERROR_ON(scores_out == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<GenerateProposalsLayerFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
+ auto func = std::make_unique<GenerateProposalsLayerFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
func->configure(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info);
// Log info
@@ -1115,7 +1115,7 @@
// Create and configure function
auto mm = get_memory_manager(ctx, TargetInfo::TargetType);
- auto func = support::cpp14::make_unique<L2NormalizeLayerFunction>(mm);
+ auto func = std::make_unique<L2NormalizeLayerFunction>(mm);
func->configure(input, output, axis, epsilon);
// Log info
@@ -1158,7 +1158,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<NormalizationLayerFunction>();
+ auto func = std::make_unique<NormalizationLayerFunction>();
func->configure(input, output, norm_info);
// Log info
@@ -1200,7 +1200,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<NormalizePlanarYUVLayerFunction>();
+ auto func = std::make_unique<NormalizePlanarYUVLayerFunction>();
func->configure(input, output, mean, std);
// Log info
@@ -1238,7 +1238,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<PadLayerFunction>();
+ auto func = std::make_unique<PadLayerFunction>();
func->configure(input, output, padding, pad_value);
// Log info
@@ -1276,7 +1276,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<PermuteLayerFunction>();
+ auto func = std::make_unique<PermuteLayerFunction>();
func->configure(input, output, perm);
// Log info
@@ -1315,7 +1315,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<PoolingLayerFunction>();
+ auto func = std::make_unique<PoolingLayerFunction>();
func->configure(input, output, pool_info);
// Log info
@@ -1354,7 +1354,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<PReluFunction>();
+ auto func = std::make_unique<PReluFunction>();
func->configure(input, alpha, output);
// Log info
@@ -1423,7 +1423,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<PriorBoxLayerFunction>();
+ auto func = std::make_unique<PriorBoxLayerFunction>();
func->configure(input0, input1, output, prior_info);
// Log info
@@ -1462,7 +1462,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<QuantizationLayerFunction>();
+ auto func = std::make_unique<QuantizationLayerFunction>();
func->configure(input, output);
// Log info
@@ -1503,7 +1503,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<ReductionOperationFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
+ auto func = std::make_unique<ReductionOperationFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
func->configure(input, output, axis, op, keep_dims);
// Log info
@@ -1543,7 +1543,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<ReorgLayerFunction>();
+ auto func = std::make_unique<ReorgLayerFunction>();
func->configure(input, output, node.stride());
// Log info
@@ -1580,7 +1580,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<ReshapeLayerFunction>();
+ auto func = std::make_unique<ReshapeLayerFunction>();
func->configure(input, output);
// Log info
@@ -1618,7 +1618,7 @@
const InterpolationPolicy policy = node.policy();
// Create and configure function
- auto func = support::cpp14::make_unique<ResizeLayerFunction>();
+ auto func = std::make_unique<ResizeLayerFunction>();
func->configure(input, output, ScaleKernelInfo{ policy, BorderMode::CONSTANT });
// Log info
@@ -1660,7 +1660,7 @@
const ROIPoolingLayerInfo pool_info = node.pooling_info();
// Create and configure function
- auto func = support::cpp14::make_unique<ROIAlignLayerFunction>();
+ auto func = std::make_unique<ROIAlignLayerFunction>();
func->configure(input, rois, output, pool_info);
@@ -1701,7 +1701,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<SliceLayerFunction>();
+ auto func = std::make_unique<SliceLayerFunction>();
func->configure(input, output, node.starts(), node.ends());
// Log info
@@ -1740,7 +1740,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<SoftmaxLayerFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
+ auto func = std::make_unique<SoftmaxLayerFunction>(get_memory_manager(ctx, TargetInfo::TargetType));
func->configure(input, output, beta);
// Log info
@@ -1781,7 +1781,7 @@
const int axis = node.axis();
// Create and configure function
- auto func = support::cpp14::make_unique<StackLayerFunction>();
+ auto func = std::make_unique<StackLayerFunction>();
func->configure(inputs, axis, output);
// Log info
@@ -1825,7 +1825,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<StridedSliceLayerFunction>();
+ auto func = std::make_unique<StridedSliceLayerFunction>();
func->configure(input, output, starts, ends, strides, info.begin_mask(), info.end_mask(), info.shrink_axis_mask());
// Log info
@@ -1868,7 +1868,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<UpsampleLayerFunction>();
+ auto func = std::make_unique<UpsampleLayerFunction>();
func->configure(input, output, info, upsampling_policy);
// Log info
@@ -1911,7 +1911,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<YOLOlayerFunction>();
+ auto func = std::make_unique<YOLOlayerFunction>();
func->configure(input, output, act_info, num_classes);
// Log info
diff --git a/arm_compute/graph/backends/Utils.h b/arm_compute/graph/backends/Utils.h
index 7d67f3b..774ce51 100644
--- a/arm_compute/graph/backends/Utils.h
+++ b/arm_compute/graph/backends/Utils.h
@@ -44,7 +44,7 @@
template <typename FunctionType, typename FunctionNameType, typename... ParameterType>
std::tuple<std::unique_ptr<arm_compute::IFunction>, FunctionNameType> create_named_function(FunctionNameType name, ParameterType... args)
{
- auto f = arm_compute::support::cpp14::make_unique<FunctionType>();
+ auto f = std::make_unique<FunctionType>();
f->configure(std::forward<ParameterType>(args)...);
return std::make_pair(std::move(f), name);
}
@@ -62,7 +62,7 @@
MemoryManagerType mm,
ParameterType... args)
{
- auto f = arm_compute::support::cpp14::make_unique<FunctionType>(mm);
+ auto f = std::make_unique<FunctionType>(mm);
f->configure(std::forward<ParameterType>(args)...);
return std::make_pair(std::move(f), name);
}
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index 74c4012..23f5033 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -300,12 +300,12 @@
ConcatLayer(SubStream &&sub_stream1, SubStream &&sub_stream2, Ts &&... rest_sub_streams)
: _sub_streams(), _concat_descriptor(DataLayoutDimension::CHANNEL)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream1)));
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream2)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream1)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream2)));
utility::for_each([&](SubStream && sub_stream)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream)));
},
std::move(rest_sub_streams)...);
}
@@ -320,12 +320,12 @@
ConcatLayer(descriptors::ConcatLayerDescriptor concat_descriptor, SubStream &&sub_stream1, SubStream &&sub_stream2, Ts &&... rest_sub_streams)
: _sub_streams(), _concat_descriptor(concat_descriptor)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream1)));
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream2)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream1)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream2)));
utility::for_each([&](SubStream && sub_stream)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream)));
},
std::move(rest_sub_streams)...);
}
@@ -337,7 +337,7 @@
ConcatLayer(SubStream &&sub_stream)
: _sub_streams(), _concat_descriptor(DataLayoutDimension::CHANNEL)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream)));
}
NodeID create_layer(IStream &s) override
{
@@ -754,8 +754,8 @@
: _num_outputs(num_outputs),
_weights(nullptr),
_bias(nullptr),
- _weights_ss(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream_weights))),
- _bias_ss(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream_bias))),
+ _weights_ss(std::make_unique<SubStream>(std::move(sub_stream_weights))),
+ _bias_ss(std::make_unique<SubStream>(std::move(sub_stream_bias))),
_fc_info(fc_info),
_weights_quant_info(std::move(weights_quant_info)),
_out_quant_info(std::move(out_quant_info))
@@ -1357,12 +1357,12 @@
StackLayer(SubStream &&sub_stream1, SubStream &&sub_stream2, Ts &&... rest_sub_streams)
: _sub_streams(), _axis(0)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream1)));
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream2)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream1)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream2)));
utility::for_each([&](SubStream && sub_stream)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream)));
},
std::move(rest_sub_streams)...);
}
@@ -1377,12 +1377,12 @@
StackLayer(int axis, SubStream &&sub_stream1, SubStream &&sub_stream2, Ts &&... rest_sub_streams)
: _sub_streams(), _axis(axis)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream1)));
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream2)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream1)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream2)));
utility::for_each([&](SubStream && sub_stream)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream)));
},
std::move(rest_sub_streams)...);
}
@@ -1394,7 +1394,7 @@
StackLayer(SubStream &&sub_stream)
: _sub_streams(), _axis(0)
{
- _sub_streams.push_back(arm_compute::support::cpp14::make_unique<SubStream>(std::move(sub_stream)));
+ _sub_streams.push_back(std::make_unique<SubStream>(std::move(sub_stream)));
}
NodeID create_layer(IStream &s) override
{