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 --- arm_compute/graph/Graph.h | 2 +- arm_compute/graph/TensorDescriptor.h | 3 +- arm_compute/graph/backends/BackendRegistry.h | 3 +- arm_compute/graph/backends/FunctionHelpers.h | 66 ++++++++++++++-------------- arm_compute/graph/backends/Utils.h | 4 +- arm_compute/graph/frontend/Layers.h | 32 +++++++------- 6 files changed, 54 insertions(+), 56 deletions(-) (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/Graph.h b/arm_compute/graph/Graph.h index 0cdd8f8faa..d8d3feb1f7 100644 --- a/arm_compute/graph/Graph.h +++ b/arm_compute/graph/Graph.h @@ -238,7 +238,7 @@ inline NodeID Graph::add_node(Ts &&... args) // Create node NodeID nid = _nodes.size(); - auto node = support::cpp14::make_unique(std::forward(args)...); + auto node = std::make_unique(std::forward(args)...); node->set_graph(this); node->set_id(nid); diff --git a/arm_compute/graph/TensorDescriptor.h b/arm_compute/graph/TensorDescriptor.h index de67289bc8..5fa155efc8 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 @@ -104,7 +103,7 @@ struct TensorDescriptor final : public misc::ICloneable // Inherited methods overridden: std::unique_ptr clone() const override { - return support::cpp14::make_unique(*this); + return std::make_unique(*this); } TensorShape shape{}; /**< Tensor shape */ diff --git a/arm_compute/graph/backends/BackendRegistry.h b/arm_compute/graph/backends/BackendRegistry.h index c4414a23f6..7c11d35faf 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 #include @@ -93,7 +92,7 @@ private: template inline void BackendRegistry::add_backend(Target target) { - _registered_backends[target] = support::cpp14::make_unique(); + _registered_backends[target] = std::make_unique(); } } // namespace backends } // namespace graph diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index e2904af0b5..05bd483cfd 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -113,7 +113,7 @@ std::unique_ptr create_activation_layer(ActivationLayerNode &node) const ActivationLayerInfo act_info = node.activation_info(); // Create function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, act_info); ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " @@ -152,7 +152,7 @@ std::unique_ptr create_arg_min_max_layer(ArgMinMaxLayerNode &node) unsigned int axis = node.axis(); // Create function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, axis, output, op); ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " @@ -194,7 +194,7 @@ std::unique_ptr create_batch_normalization_layer(BatchNormalizationLa const ActivationLayerInfo fused_act = node.fused_activation(); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, mean, var, beta, gamma, epsilon, fused_act); // Log info @@ -346,7 +346,7 @@ std::unique_ptr create_bounding_box_transform_layer(BoundingBoxTransf const BoundingBoxTransformInfo bbox_info = node.info(); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, deltas, bbox_info); // Log info @@ -383,7 +383,7 @@ std::unique_ptr create_channel_shuffle_layer(ChannelShuffleLayerNode const unsigned int num_groups = node.num_groups(); // Create function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, num_groups); ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " @@ -430,7 +430,7 @@ std::unique_ptr create_concatenate_layer(ConcatenateLaye const size_t concat_axis = get_dimension_idx(data_layout, node.concatenation_axis()); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(inputs, output, concat_axis); // Log info @@ -673,7 +673,7 @@ std::unique_ptr create_depth_to_space_layer(DepthToSpaceLayerNode &no ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, node.block_shape()); // Log info @@ -712,7 +712,7 @@ std::unique_ptr create_dequantization_layer(DequantizationLayerNode & ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output); // Log info @@ -755,7 +755,7 @@ std::unique_ptr create_detection_output_layer(DetectionOutputLayerNod ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input0, input1, input2, output, detect_info); // Log info @@ -807,7 +807,7 @@ std::unique_ptr create_detection_post_process_layer(DetectionPostProc ARM_COMPUTE_ERROR_ON(output3 == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input0, input1, input2, output0, output1, output2, output3, detect_info); // Log info @@ -968,7 +968,7 @@ std::unique_ptr create_flatten_layer(FlattenLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output); // Log info @@ -1013,7 +1013,7 @@ std::unique_ptr create_fully_connected_layer(FullyConnectedLayerNode // 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(mm, wm.get()); + auto func = std::make_unique(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 @@ std::unique_ptr create_generate_proposals_layer(GenerateProposalsLaye ARM_COMPUTE_ERROR_ON(scores_out == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); + auto func = std::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); func->configure(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info); // Log info @@ -1115,7 +1115,7 @@ std::unique_ptr create_l2_normalize_layer(L2NormalizeLayerNode &node, // Create and configure function auto mm = get_memory_manager(ctx, TargetInfo::TargetType); - auto func = support::cpp14::make_unique(mm); + auto func = std::make_unique(mm); func->configure(input, output, axis, epsilon); // Log info @@ -1158,7 +1158,7 @@ std::unique_ptr create_normalization_layer(NormalizationLayerNode &no ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, norm_info); // Log info @@ -1200,7 +1200,7 @@ std::unique_ptr create_normalize_planar_yuv_layer(NormalizePlanarYUVL ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, mean, std); // Log info @@ -1238,7 +1238,7 @@ std::unique_ptr create_pad_layer(PadLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, padding, pad_value); // Log info @@ -1276,7 +1276,7 @@ std::unique_ptr create_permute_layer(PermuteLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, perm); // Log info @@ -1315,7 +1315,7 @@ std::unique_ptr create_pooling_layer(PoolingLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, pool_info); // Log info @@ -1354,7 +1354,7 @@ std::unique_ptr create_prelu_layer(PReluLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, alpha, output); // Log info @@ -1423,7 +1423,7 @@ std::unique_ptr create_priorbox_layer(PriorBoxLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input0, input1, output, prior_info); // Log info @@ -1462,7 +1462,7 @@ std::unique_ptr create_quantization_layer(QuantizationLayerNode &node ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output); // Log info @@ -1503,7 +1503,7 @@ std::unique_ptr create_reduction_operation_layer(ReductionLayerNode & ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); + auto func = std::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); func->configure(input, output, axis, op, keep_dims); // Log info @@ -1543,7 +1543,7 @@ std::unique_ptr create_reorg_layer(ReorgLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, node.stride()); // Log info @@ -1580,7 +1580,7 @@ std::unique_ptr create_reshape_layer(ReshapeLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output); // Log info @@ -1618,7 +1618,7 @@ std::unique_ptr create_resize_layer(ResizeLayerNode &node) const InterpolationPolicy policy = node.policy(); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, ScaleKernelInfo{ policy, BorderMode::CONSTANT }); // Log info @@ -1660,7 +1660,7 @@ std::unique_ptr create_roi_align_layer(ROIAlignLayerNode &node) const ROIPoolingLayerInfo pool_info = node.pooling_info(); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, rois, output, pool_info); @@ -1701,7 +1701,7 @@ std::unique_ptr create_slice_layer(SliceLayerNode &node) ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, node.starts(), node.ends()); // Log info @@ -1740,7 +1740,7 @@ std::unique_ptr create_softmax_layer(SoftmaxLayerNode &node, GraphCon ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); + auto func = std::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); func->configure(input, output, beta); // Log info @@ -1781,7 +1781,7 @@ std::unique_ptr create_stack_layer(StackLayerNode &node) const int axis = node.axis(); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(inputs, axis, output); // Log info @@ -1825,7 +1825,7 @@ std::unique_ptr create_strided_slice_layer(StridedSliceLayerNode &nod ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, starts, ends, strides, info.begin_mask(), info.end_mask(), info.shrink_axis_mask()); // Log info @@ -1868,7 +1868,7 @@ std::unique_ptr create_upsample_layer(UpsampleLayerNode &node, GraphC ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); func->configure(input, output, info, upsampling_policy); // Log info @@ -1911,7 +1911,7 @@ std::unique_ptr create_yolo_layer(YOLOLayerNode &node, GraphContext & ARM_COMPUTE_ERROR_ON(output == nullptr); // Create and configure function - auto func = support::cpp14::make_unique(); + auto func = std::make_unique(); 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 7d67f3b9e3..774ce515b5 100644 --- a/arm_compute/graph/backends/Utils.h +++ b/arm_compute/graph/backends/Utils.h @@ -44,7 +44,7 @@ namespace backends template std::tuple, FunctionNameType> create_named_function(FunctionNameType name, ParameterType... args) { - auto f = arm_compute::support::cpp14::make_unique(); + auto f = std::make_unique(); f->configure(std::forward(args)...); return std::make_pair(std::move(f), name); } @@ -62,7 +62,7 @@ std::tuple, FunctionNameType> create_nam MemoryManagerType mm, ParameterType... args) { - auto f = arm_compute::support::cpp14::make_unique(mm); + auto f = std::make_unique(mm); f->configure(std::forward(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 74c40126c8..23f503342b 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -300,12 +300,12 @@ public: 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(std::move(sub_stream1))); - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream2))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream1))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream2))); utility::for_each([&](SubStream && sub_stream) { - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream))); }, std::move(rest_sub_streams)...); } @@ -320,12 +320,12 @@ public: 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(std::move(sub_stream1))); - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream2))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream1))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream2))); utility::for_each([&](SubStream && sub_stream) { - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream))); }, std::move(rest_sub_streams)...); } @@ -337,7 +337,7 @@ public: ConcatLayer(SubStream &&sub_stream) : _sub_streams(), _concat_descriptor(DataLayoutDimension::CHANNEL) { - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream))); } NodeID create_layer(IStream &s) override { @@ -754,8 +754,8 @@ public: : _num_outputs(num_outputs), _weights(nullptr), _bias(nullptr), - _weights_ss(arm_compute::support::cpp14::make_unique(std::move(sub_stream_weights))), - _bias_ss(arm_compute::support::cpp14::make_unique(std::move(sub_stream_bias))), + _weights_ss(std::make_unique(std::move(sub_stream_weights))), + _bias_ss(std::make_unique(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 @@ public: 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(std::move(sub_stream1))); - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream2))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream1))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream2))); utility::for_each([&](SubStream && sub_stream) { - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream))); }, std::move(rest_sub_streams)...); } @@ -1377,12 +1377,12 @@ public: 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(std::move(sub_stream1))); - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream2))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream1))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream2))); utility::for_each([&](SubStream && sub_stream) { - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream))); }, std::move(rest_sub_streams)...); } @@ -1394,7 +1394,7 @@ public: StackLayer(SubStream &&sub_stream) : _sub_streams(), _axis(0) { - _sub_streams.push_back(arm_compute::support::cpp14::make_unique(std::move(sub_stream))); + _sub_streams.push_back(std::make_unique(std::move(sub_stream))); } NodeID create_layer(IStream &s) override { -- cgit v1.2.1