aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/NEON/functions/NEConcatenateLayer.cpp
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 /src/runtime/NEON/functions/NEConcatenateLayer.cpp
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 'src/runtime/NEON/functions/NEConcatenateLayer.cpp')
-rw-r--r--src/runtime/NEON/functions/NEConcatenateLayer.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/runtime/NEON/functions/NEConcatenateLayer.cpp b/src/runtime/NEON/functions/NEConcatenateLayer.cpp
index 03a01aec6b..782f8f1ff7 100644
--- a/src/runtime/NEON/functions/NEConcatenateLayer.cpp
+++ b/src/runtime/NEON/functions/NEConcatenateLayer.cpp
@@ -36,7 +36,6 @@
#include "arm_compute/core/TensorInfo.h"
#include "arm_compute/core/Types.h"
#include "src/core/helpers/AutoConfiguration.h"
-#include "support/MemorySupport.h"
namespace arm_compute
{
@@ -68,28 +67,28 @@ void NEConcatenation::configure(const std::vector<const ITensorInfo *> &inputs_v
{
case Window::DimX:
{
- auto kernel = support::cpp14::make_unique<NEWidthConcatenateLayerKernel>();
+ auto kernel = std::make_unique<NEWidthConcatenateLayerKernel>();
kernel->configure(inputs_vector.at(i), offset, output);
_concat_kernels.emplace_back(std::move(kernel));
break;
}
case Window::DimY:
{
- auto kernel = support::cpp14::make_unique<NEHeightConcatenateLayerKernel>();
+ auto kernel = std::make_unique<NEHeightConcatenateLayerKernel>();
kernel->configure(inputs_vector.at(i), offset, output);
_concat_kernels.emplace_back(std::move(kernel));
break;
}
case Window::DimZ:
{
- auto kernel = support::cpp14::make_unique<NEDepthConcatenateLayerKernel>();
+ auto kernel = std::make_unique<NEDepthConcatenateLayerKernel>();
kernel->configure(inputs_vector.at(i), offset, output);
_concat_kernels.emplace_back(std::move(kernel));
break;
}
case 3:
{
- auto kernel = support::cpp14::make_unique<NEBatchConcatenateLayerKernel>();
+ auto kernel = std::make_unique<NEBatchConcatenateLayerKernel>();
kernel->configure(inputs_vector.at(i), offset, output);
_concat_kernels.emplace_back(std::move(kernel));
break;
@@ -181,7 +180,7 @@ struct NEConcatenateLayer::Impl
};
NEConcatenateLayer::NEConcatenateLayer()
- : _impl(support::cpp14::make_unique<Impl>())
+ : _impl(std::make_unique<Impl>())
{
}
@@ -199,7 +198,7 @@ void NEConcatenateLayer::configure(std::vector<const ITensor *> inputs_vector, I
_impl->dst = output;
_impl->axis = axis;
_impl->num_inputs = inputs_vector.size();
- _impl->op = arm_compute::support::cpp14::make_unique<experimental::NEConcatenation>();
+ _impl->op = std::make_unique<experimental::NEConcatenation>();
std::vector<const ITensorInfo *> inputs_vector_info;
for(unsigned int i = 0; i < inputs_vector.size(); ++i)