aboutsummaryrefslogtreecommitdiff
path: root/arm_compute/graph/frontend/Layers.h
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 /arm_compute/graph/frontend/Layers.h
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 'arm_compute/graph/frontend/Layers.h')
-rw-r--r--arm_compute/graph/frontend/Layers.h32
1 files changed, 16 insertions, 16 deletions
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<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 @@ 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<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 @@ public:
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 @@ public:
: _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 @@ 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<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 @@ 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<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 @@ public:
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
{