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/graph/Graph.cpp | 4 ++-- src/graph/Utils.cpp | 14 +++++++------- src/graph/backends/CL/CLDeviceBackend.cpp | 6 +++--- src/graph/backends/CL/CLFunctionsFactory.cpp | 8 ++++---- src/graph/backends/GLES/GCDeviceBackend.cpp | 2 +- src/graph/backends/NEON/NEDeviceBackend.cpp | 4 ++-- src/graph/backends/NEON/NEFunctionFactory.cpp | 2 +- src/graph/mutators/SyntheticDataTypeMutator.cpp | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/graph') diff --git a/src/graph/Graph.cpp b/src/graph/Graph.cpp index af75eacc02..4ce53589d4 100644 --- a/src/graph/Graph.cpp +++ b/src/graph/Graph.cpp @@ -96,7 +96,7 @@ EdgeID Graph::add_connection(NodeID source, size_t source_idx, NodeID sink, size // Create connections EdgeID eid = _edges.size(); - auto connection = arm_compute::support::cpp14::make_unique(eid, source_node.get(), source_idx, sink_node.get(), sink_idx, tensor.get()); + auto connection = std::make_unique(eid, source_node.get(), source_idx, sink_node.get(), sink_idx, tensor.get()); _edges.push_back(std::move(connection)); // Add connections to source and sink nodes @@ -155,7 +155,7 @@ bool Graph::remove_connection(EdgeID eid) TensorID Graph::create_tensor(const TensorDescriptor &desc) { TensorID tid = _tensors.size(); - auto tensor = support::cpp14::make_unique(tid, desc); + auto tensor = std::make_unique(tid, desc); _tensors.push_back(std::move(tensor)); return tid; diff --git a/src/graph/Utils.cpp b/src/graph/Utils.cpp index 64890585e0..2835af311a 100644 --- a/src/graph/Utils.cpp +++ b/src/graph/Utils.cpp @@ -83,16 +83,16 @@ PassManager create_default_pass_manager(Target target, const GraphConfig &cfg) // Passes that mutate graph IR if(cfg.convert_to_uint8) { - pm.append(support::cpp14::make_unique(), !is_target_gc); + pm.append(std::make_unique(), !is_target_gc); } - pm.append(support::cpp14::make_unique(), !is_target_gc); - pm.append(support::cpp14::make_unique()); - pm.append(support::cpp14::make_unique(), !is_target_gc); + pm.append(std::make_unique(), !is_target_gc); + pm.append(std::make_unique()); + pm.append(std::make_unique(), !is_target_gc); // Passes that mutate backend information - pm.append(support::cpp14::make_unique(), !is_target_gc); - pm.append(support::cpp14::make_unique(), !is_target_gc); - pm.append(support::cpp14::make_unique()); + pm.append(std::make_unique(), !is_target_gc); + pm.append(std::make_unique(), !is_target_gc); + pm.append(std::make_unique()); return pm; } diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp index b2d58e35be..bc7bbddbd8 100644 --- a/src/graph/backends/CL/CLDeviceBackend.cpp +++ b/src/graph/backends/CL/CLDeviceBackend.cpp @@ -93,7 +93,7 @@ void CLDeviceBackend::initialize_backend() // Setup Scheduler CLScheduler::get().default_init(&_tuner); // Create allocator with new context - _allocator = support::cpp14::make_unique(nullptr /* legacy path for CLCoreRuntimeContext */); + _allocator = std::make_unique(nullptr /* legacy path for CLCoreRuntimeContext */); } void CLDeviceBackend::release_backend_context(GraphContext &ctx) @@ -170,7 +170,7 @@ std::unique_ptr CLDeviceBackend::create_tensor(const Tensor &tens TensorInfo info(tensor_desc.shape, 1, tensor_desc.data_type, tensor_desc.quant_info); info.set_data_layout(tensor_desc.layout); - return support::cpp14::make_unique(info); + return std::make_unique(info); } std::unique_ptr CLDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent) @@ -180,7 +180,7 @@ std::unique_ptr CLDeviceBackend::create_subtensor(ITensorHandle * return nullptr; } - return support::cpp14::make_unique(parent, shape, coords, extend_parent); + return std::make_unique(parent, shape, coords, extend_parent); } std::unique_ptr CLDeviceBackend::configure_node(INode &node, GraphContext &ctx) diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 98013b9e49..641dcc36ce 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -143,7 +143,7 @@ std::unique_ptr create_detection_output_layer(); + auto func = std::make_unique(); func->configure(input0, input1, input2, output, detect_info); // Log info @@ -159,7 +159,7 @@ std::unique_ptr create_detection_output_layer(); + auto wrap_function = std::make_unique(); wrap_function->register_function(std::move(func)); wrap_function->register_tensor(input0); @@ -193,7 +193,7 @@ std::unique_ptr create_detection_post_process_layer(); + auto func = std::make_unique(); func->configure(input0, input1, input2, output0, output1, output2, output3, detect_info); // Log info @@ -212,7 +212,7 @@ std::unique_ptr create_detection_post_process_layer(); + auto wrap_function = std::make_unique(); wrap_function->register_function(std::move(func)); wrap_function->register_tensor(input0); diff --git a/src/graph/backends/GLES/GCDeviceBackend.cpp b/src/graph/backends/GLES/GCDeviceBackend.cpp index 252093cf2e..dcab2a5697 100644 --- a/src/graph/backends/GLES/GCDeviceBackend.cpp +++ b/src/graph/backends/GLES/GCDeviceBackend.cpp @@ -112,7 +112,7 @@ std::unique_ptr GCDeviceBackend::create_tensor(const Tensor &tens TensorInfo info(tensor_desc.shape, 1, tensor_desc.data_type, tensor_desc.quant_info); info.set_data_layout(tensor_desc.layout); - return support::cpp14::make_unique(info); + return std::make_unique(info); } std::unique_ptr GCDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent) diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp index adb87a952b..7f87710cf3 100644 --- a/src/graph/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph/backends/NEON/NEDeviceBackend.cpp @@ -123,7 +123,7 @@ std::unique_ptr NEDeviceBackend::create_tensor(const Tensor &tens TensorInfo info(tensor_desc.shape, 1, tensor_desc.data_type, tensor_desc.quant_info); info.set_data_layout(tensor_desc.layout); - return support::cpp14::make_unique(info); + return std::make_unique(info); } std::unique_ptr NEDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent) @@ -133,7 +133,7 @@ std::unique_ptr NEDeviceBackend::create_subtensor(ITensorHandle * return nullptr; } - return support::cpp14::make_unique(parent, shape, coords, extend_parent); + return std::make_unique(parent, shape, coords, extend_parent); } std::unique_ptr NEDeviceBackend::configure_node(INode &node, GraphContext &ctx) diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index ec06f3fa30..d070433e4d 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -102,7 +102,7 @@ std::unique_ptr create_normalization_layer(get_memory_manager(ctx, NETargetInfo::TargetType)); + auto func = std::make_unique(get_memory_manager(ctx, NETargetInfo::TargetType)); func->configure(input, output, norm_info); // Log info diff --git a/src/graph/mutators/SyntheticDataTypeMutator.cpp b/src/graph/mutators/SyntheticDataTypeMutator.cpp index 532c0e821b..21bafa61e1 100644 --- a/src/graph/mutators/SyntheticDataTypeMutator.cpp +++ b/src/graph/mutators/SyntheticDataTypeMutator.cpp @@ -222,7 +222,7 @@ void handle_nodes_with_bias(Graph &g) auto depth = b_desc.shape[get_dimension_idx(b_desc.layout, DataLayoutDimension::BATCHES)]; b_desc.shape = TensorShape(depth); - auto accessor = support::cpp14::make_unique(); + auto accessor = std::make_unique(); auto b_nid = GraphBuilder::add_const_node(g, params, b_desc, std::move(accessor)); g.add_connection(b_nid, 0, node_id, 2); } -- cgit v1.2.1