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 --- .../NEON/functions/NEElementwiseOperators.cpp | 43 +++++++++++----------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'src/runtime/NEON/functions/NEElementwiseOperators.cpp') diff --git a/src/runtime/NEON/functions/NEElementwiseOperators.cpp b/src/runtime/NEON/functions/NEElementwiseOperators.cpp index 7f3fe8b30b..badcf2e997 100644 --- a/src/runtime/NEON/functions/NEElementwiseOperators.cpp +++ b/src/runtime/NEON/functions/NEElementwiseOperators.cpp @@ -26,7 +26,6 @@ #include #include "arm_compute/core/ITensor.h" -#include "support/MemorySupport.h" #include @@ -36,7 +35,7 @@ namespace experimental { void NEElementwiseMax::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(ArithmeticOperation::MAX, input1, input2, output); _kernel = std::move(k); } @@ -48,7 +47,7 @@ Status NEElementwiseMax::validate(const ITensorInfo *input1, const ITensorInfo * void NEElementwiseMin::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(ArithmeticOperation::MIN, input1, input2, output); _kernel = std::move(k); } @@ -60,7 +59,7 @@ Status NEElementwiseMin::validate(const ITensorInfo *input1, const ITensorInfo * void NEElementwiseSquaredDiff::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(ArithmeticOperation::SQUARED_DIFF, input1, input2, output); _kernel = std::move(k); } @@ -72,7 +71,7 @@ Status NEElementwiseSquaredDiff::validate(const ITensorInfo *input1, const ITens void NEElementwiseDivision::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(input1, input2, output); _kernel = std::move(k); } @@ -84,7 +83,7 @@ Status NEElementwiseDivision::validate(const ITensorInfo *input1, const ITensorI void NEElementwisePower::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(input1, input2, output); _kernel = std::move(k); } @@ -97,7 +96,7 @@ Status NEElementwisePower::validate(const ITensorInfo *input1, const ITensorInfo template void NEElementwiseComparisonStatic::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(COP, input1, input2, output); _kernel = std::move(k); } @@ -110,7 +109,7 @@ Status NEElementwiseComparisonStatic::validate(const ITensorInfo *input1, c void NEElementwiseComparison::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output, ComparisonOperation op) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(op, input1, input2, output); _kernel = std::move(k); } @@ -138,7 +137,7 @@ struct NEElementwiseMax::Impl }; NEElementwiseMax::NEElementwiseMax() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } NEElementwiseMax::NEElementwiseMax(NEElementwiseMax &&) = default; @@ -151,7 +150,7 @@ void NEElementwiseMax::configure(ITensor *input1, ITensor *input2, ITensor *outp _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(input1->info(), input2->info(), output->info()); } @@ -179,7 +178,7 @@ struct NEElementwiseMin::Impl }; NEElementwiseMin::NEElementwiseMin() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } NEElementwiseMin::NEElementwiseMin(NEElementwiseMin &&) = default; @@ -192,7 +191,7 @@ void NEElementwiseMin::configure(ITensor *input1, ITensor *input2, ITensor *outp _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(input1->info(), input2->info(), output->info()); } @@ -220,7 +219,7 @@ struct NEElementwiseSquaredDiff::Impl }; NEElementwiseSquaredDiff::NEElementwiseSquaredDiff() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } NEElementwiseSquaredDiff::NEElementwiseSquaredDiff(NEElementwiseSquaredDiff &&) = default; @@ -233,7 +232,7 @@ void NEElementwiseSquaredDiff::configure(ITensor *input1, ITensor *input2, ITens _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(input1->info(), input2->info(), output->info()); } @@ -261,7 +260,7 @@ struct NEElementwiseDivision::Impl }; NEElementwiseDivision::NEElementwiseDivision() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } NEElementwiseDivision::NEElementwiseDivision(NEElementwiseDivision &&) = default; @@ -274,7 +273,7 @@ void NEElementwiseDivision::configure(ITensor *input1, ITensor *input2, ITensor _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(input1->info(), input2->info(), output->info()); } @@ -302,7 +301,7 @@ struct NEElementwisePower::Impl }; NEElementwisePower::NEElementwisePower() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } NEElementwisePower::NEElementwisePower(NEElementwisePower &&) = default; @@ -315,7 +314,7 @@ void NEElementwisePower::configure(ITensor *input1, ITensor *input2, ITensor *ou _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(input1->info(), input2->info(), output->info()); } @@ -345,7 +344,7 @@ struct NEElementwiseComparisonStatic::Impl template NEElementwiseComparisonStatic::NEElementwiseComparisonStatic() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } template @@ -361,7 +360,7 @@ void NEElementwiseComparisonStatic::configure(ITensor *input1, ITensor *inp _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique>(); + _impl->op = std::make_unique>(); _impl->op->configure(input1->info(), input2->info(), output->info()); } @@ -390,7 +389,7 @@ struct NEElementwiseComparison::Impl }; NEElementwiseComparison::NEElementwiseComparison() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } NEElementwiseComparison::NEElementwiseComparison(NEElementwiseComparison &&) = default; @@ -402,7 +401,7 @@ void NEElementwiseComparison::configure(ITensor *input1, ITensor *input2, ITenso _impl->src_0 = input1; _impl->src_1 = input2; _impl->dst = output; - _impl->op = arm_compute::support::cpp14::make_unique(); + _impl->op = std::make_unique(); _impl->op->configure(input1->info(), input2->info(), output->info(), op); } -- cgit v1.2.1