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/src/graph/Graph.cpp b/src/graph/Graph.cpp
index af75eac..4ce5358 100644
--- a/src/graph/Graph.cpp
+++ b/src/graph/Graph.cpp
@@ -96,7 +96,7 @@
// Create connections
EdgeID eid = _edges.size();
- auto connection = arm_compute::support::cpp14::make_unique<Edge>(eid, source_node.get(), source_idx, sink_node.get(), sink_idx, tensor.get());
+ auto connection = std::make_unique<Edge>(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 @@
TensorID Graph::create_tensor(const TensorDescriptor &desc)
{
TensorID tid = _tensors.size();
- auto tensor = support::cpp14::make_unique<Tensor>(tid, desc);
+ auto tensor = std::make_unique<Tensor>(tid, desc);
_tensors.push_back(std::move(tensor));
return tid;
diff --git a/src/graph/Utils.cpp b/src/graph/Utils.cpp
index 6489058..2835af3 100644
--- a/src/graph/Utils.cpp
+++ b/src/graph/Utils.cpp
@@ -83,16 +83,16 @@
// Passes that mutate graph IR
if(cfg.convert_to_uint8)
{
- pm.append(support::cpp14::make_unique<SyntheticDataTypeMutator>(), !is_target_gc);
+ pm.append(std::make_unique<SyntheticDataTypeMutator>(), !is_target_gc);
}
- pm.append(support::cpp14::make_unique<NodeFusionMutator>(), !is_target_gc);
- pm.append(support::cpp14::make_unique<GroupedConvolutionMutator>());
- pm.append(support::cpp14::make_unique<InPlaceOperationMutator>(), !is_target_gc);
+ pm.append(std::make_unique<NodeFusionMutator>(), !is_target_gc);
+ pm.append(std::make_unique<GroupedConvolutionMutator>());
+ pm.append(std::make_unique<InPlaceOperationMutator>(), !is_target_gc);
// Passes that mutate backend information
- pm.append(support::cpp14::make_unique<DepthConcatSubTensorMutator>(), !is_target_gc);
- pm.append(support::cpp14::make_unique<SplitLayerSubTensorMutator>(), !is_target_gc);
- pm.append(support::cpp14::make_unique<NodeExecutionMethodMutator>());
+ pm.append(std::make_unique<DepthConcatSubTensorMutator>(), !is_target_gc);
+ pm.append(std::make_unique<SplitLayerSubTensorMutator>(), !is_target_gc);
+ pm.append(std::make_unique<NodeExecutionMethodMutator>());
return pm;
}
diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp
index b2d58e3..bc7bbdd 100644
--- a/src/graph/backends/CL/CLDeviceBackend.cpp
+++ b/src/graph/backends/CL/CLDeviceBackend.cpp
@@ -93,7 +93,7 @@
// Setup Scheduler
CLScheduler::get().default_init(&_tuner);
// Create allocator with new context
- _allocator = support::cpp14::make_unique<CLBufferAllocator>(nullptr /* legacy path for CLCoreRuntimeContext */);
+ _allocator = std::make_unique<CLBufferAllocator>(nullptr /* legacy path for CLCoreRuntimeContext */);
}
void CLDeviceBackend::release_backend_context(GraphContext &ctx)
@@ -170,7 +170,7 @@
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<CLTensorHandle>(info);
+ return std::make_unique<CLTensorHandle>(info);
}
std::unique_ptr<ITensorHandle> CLDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent)
@@ -180,7 +180,7 @@
return nullptr;
}
- return support::cpp14::make_unique<CLSubTensorHandle>(parent, shape, coords, extend_parent);
+ return std::make_unique<CLSubTensorHandle>(parent, shape, coords, extend_parent);
}
std::unique_ptr<arm_compute::IFunction> CLDeviceBackend::configure_node(INode &node, GraphContext &ctx)
diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp
index 98013b9..641dcc3 100644
--- a/src/graph/backends/CL/CLFunctionsFactory.cpp
+++ b/src/graph/backends/CL/CLFunctionsFactory.cpp
@@ -143,7 +143,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<CPPDetectionOutputLayer>();
+ auto func = std::make_unique<CPPDetectionOutputLayer>();
func->configure(input0, input1, input2, output, detect_info);
// Log info
@@ -159,7 +159,7 @@
<< " DetectionOutputLayer info: " << detect_info
<< std::endl);
- auto wrap_function = support::cpp14::make_unique<CPPWrapperFunction>();
+ auto wrap_function = std::make_unique<CPPWrapperFunction>();
wrap_function->register_function(std::move(func));
wrap_function->register_tensor(input0);
@@ -193,7 +193,7 @@
ARM_COMPUTE_ERROR_ON(output3 == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<CPPDetectionPostProcessLayer>();
+ auto func = std::make_unique<CPPDetectionPostProcessLayer>();
func->configure(input0, input1, input2, output0, output1, output2, output3, detect_info);
// Log info
@@ -212,7 +212,7 @@
<< " DetectionPostProcessLayer info: " << detect_info
<< std::endl);
- auto wrap_function = support::cpp14::make_unique<CPPWrapperFunction>();
+ auto wrap_function = std::make_unique<CPPWrapperFunction>();
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 252093c..dcab2a5 100644
--- a/src/graph/backends/GLES/GCDeviceBackend.cpp
+++ b/src/graph/backends/GLES/GCDeviceBackend.cpp
@@ -112,7 +112,7 @@
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<GCTensorHandle>(info);
+ return std::make_unique<GCTensorHandle>(info);
}
std::unique_ptr<ITensorHandle> 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 adb87a9..7f87710 100644
--- a/src/graph/backends/NEON/NEDeviceBackend.cpp
+++ b/src/graph/backends/NEON/NEDeviceBackend.cpp
@@ -123,7 +123,7 @@
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<NETensorHandle>(info);
+ return std::make_unique<NETensorHandle>(info);
}
std::unique_ptr<ITensorHandle> NEDeviceBackend::create_subtensor(ITensorHandle *parent, TensorShape shape, Coordinates coords, bool extend_parent)
@@ -133,7 +133,7 @@
return nullptr;
}
- return support::cpp14::make_unique<NESubTensorHandle>(parent, shape, coords, extend_parent);
+ return std::make_unique<NESubTensorHandle>(parent, shape, coords, extend_parent);
}
std::unique_ptr<arm_compute::IFunction> NEDeviceBackend::configure_node(INode &node, GraphContext &ctx)
diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp
index ec06f3f..d070433 100644
--- a/src/graph/backends/NEON/NEFunctionFactory.cpp
+++ b/src/graph/backends/NEON/NEFunctionFactory.cpp
@@ -102,7 +102,7 @@
ARM_COMPUTE_ERROR_ON(output == nullptr);
// Create and configure function
- auto func = support::cpp14::make_unique<NENormalizationLayer>(get_memory_manager(ctx, NETargetInfo::TargetType));
+ auto func = std::make_unique<NENormalizationLayer>(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 532c0e8..21bafa6 100644
--- a/src/graph/mutators/SyntheticDataTypeMutator.cpp
+++ b/src/graph/mutators/SyntheticDataTypeMutator.cpp
@@ -222,7 +222,7 @@
auto depth = b_desc.shape[get_dimension_idx(b_desc.layout, DataLayoutDimension::BATCHES)];
b_desc.shape = TensorShape(depth);
- auto accessor = support::cpp14::make_unique<EmptyAccessor>();
+ auto accessor = std::make_unique<EmptyAccessor>();
auto b_nid = GraphBuilder::add_const_node(g, params, b_desc, std::move(accessor));
g.add_connection(b_nid, 0, node_id, 2);
}