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 --- .../CL/functions/CLElementwiseOperations.cpp | 43 +++++++++++----------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'src/runtime/CL/functions/CLElementwiseOperations.cpp') diff --git a/src/runtime/CL/functions/CLElementwiseOperations.cpp b/src/runtime/CL/functions/CLElementwiseOperations.cpp index 736cf973a1..a72e957fe6 100644 --- a/src/runtime/CL/functions/CLElementwiseOperations.cpp +++ b/src/runtime/CL/functions/CLElementwiseOperations.cpp @@ -26,7 +26,6 @@ #include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "src/core/CL/kernels/CLElementwiseOperationKernel.h" -#include "support/MemorySupport.h" #include @@ -40,7 +39,7 @@ CLArithmeticAddition::CLArithmeticAddition() void CLArithmeticAddition::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, ConvertPolicy policy, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::ADD, input1, input2, output, policy, act_info); _kernel = std::move(k); } @@ -61,7 +60,7 @@ CLArithmeticSubtraction::CLArithmeticSubtraction() void CLArithmeticSubtraction::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, ConvertPolicy policy, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::SUB, input1, input2, output, policy, act_info); _kernel = std::move(k); } @@ -83,7 +82,7 @@ CLArithmeticDivision::CLArithmeticDivision() void CLArithmeticDivision::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::DIV, input1, input2, output, act_info); _kernel = std::move(k); } @@ -104,7 +103,7 @@ CLElementwiseMax::CLElementwiseMax() void CLElementwiseMax::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::MAX, input1, input2, output, act_info); _kernel = std::move(k); } @@ -125,7 +124,7 @@ CLElementwiseMin::CLElementwiseMin() void CLElementwiseMin::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::MIN, input1, input2, output, act_info); _kernel = std::move(k); } @@ -146,7 +145,7 @@ CLElementwiseSquaredDiff::CLElementwiseSquaredDiff() void CLElementwiseSquaredDiff::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::SQUARED_DIFF, input1, input2, output, act_info); _kernel = std::move(k); } @@ -167,7 +166,7 @@ CLElementwisePower::CLElementwisePower() void CLElementwisePower::configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output, const ActivationLayerInfo &act_info) { - auto k = arm_compute::support::cpp14::make_unique(); + auto k = std::make_unique(); k->configure(compile_context, ArithmeticOperation::POWER, input1, input2, output, act_info); _kernel = std::move(k); } @@ -192,7 +191,7 @@ struct CLArithmeticAddition::Impl }; CLArithmeticAddition::CLArithmeticAddition() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLArithmeticAddition::CLArithmeticAddition(CLArithmeticAddition &&) = default; @@ -210,7 +209,7 @@ void CLArithmeticAddition::configure(const CLCompileContext &compile_context, co _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(compile_context, input1->info(), input2->info(), output->info(), policy, act_info); } @@ -238,7 +237,7 @@ struct CLArithmeticSubtraction::Impl }; CLArithmeticSubtraction::CLArithmeticSubtraction() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLArithmeticSubtraction::CLArithmeticSubtraction(CLArithmeticSubtraction &&) = default; @@ -256,7 +255,7 @@ void CLArithmeticSubtraction::configure(const CLCompileContext &compile_context, _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(compile_context, input1->info(), input2->info(), output->info(), policy, act_info); } @@ -284,7 +283,7 @@ struct CLArithmeticDivision::Impl }; CLArithmeticDivision::CLArithmeticDivision() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLArithmeticDivision::CLArithmeticDivision(CLArithmeticDivision &&) = default; @@ -301,7 +300,7 @@ void CLArithmeticDivision::configure(const CLCompileContext &compile_context, co _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(compile_context, input1->info(), input2->info(), output->info(), act_info); } @@ -329,7 +328,7 @@ struct CLElementwiseMax::Impl }; CLElementwiseMax::CLElementwiseMax() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLElementwiseMax::CLElementwiseMax(CLElementwiseMax &&) = default; @@ -346,7 +345,7 @@ void CLElementwiseMax::configure(const CLCompileContext &compile_context, ICLTen _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(compile_context, input1->info(), input2->info(), output->info(), act_info); } @@ -374,7 +373,7 @@ struct CLElementwiseMin::Impl }; CLElementwiseMin::CLElementwiseMin() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLElementwiseMin::CLElementwiseMin(CLElementwiseMin &&) = default; @@ -391,7 +390,7 @@ void CLElementwiseMin::configure(const CLCompileContext &compile_context, ICLTen _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(compile_context, input1->info(), input2->info(), output->info(), act_info); } @@ -419,7 +418,7 @@ struct CLElementwiseSquaredDiff::Impl }; CLElementwiseSquaredDiff::CLElementwiseSquaredDiff() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLElementwiseSquaredDiff::CLElementwiseSquaredDiff(CLElementwiseSquaredDiff &&) = default; @@ -436,7 +435,7 @@ void CLElementwiseSquaredDiff::configure(const CLCompileContext &compile_context _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(compile_context, input1->info(), input2->info(), output->info(), act_info); } @@ -464,7 +463,7 @@ struct CLElementwisePower::Impl }; CLElementwisePower::CLElementwisePower() - : _impl(support::cpp14::make_unique()) + : _impl(std::make_unique()) { } CLElementwisePower::CLElementwisePower(CLElementwisePower &&) = default; @@ -481,7 +480,7 @@ void CLElementwisePower::configure(const CLCompileContext &compile_context, ICLT _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(compile_context, input1->info(), input2->info(), output->info(), act_info); } -- cgit v1.2.1