diff options
Diffstat (limited to 'src/runtime/NEON/functions/NEFlattenLayer.cpp')
-rw-r--r-- | src/runtime/NEON/functions/NEFlattenLayer.cpp | 52 |
1 files changed, 44 insertions, 8 deletions
diff --git a/src/runtime/NEON/functions/NEFlattenLayer.cpp b/src/runtime/NEON/functions/NEFlattenLayer.cpp index a28411c4e9..56db2be3fa 100644 --- a/src/runtime/NEON/functions/NEFlattenLayer.cpp +++ b/src/runtime/NEON/functions/NEFlattenLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 ARM Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -23,21 +23,57 @@ */ #include "arm_compute/runtime/NEON/functions/NEFlattenLayer.h" -#include "arm_compute/core/NEON/kernels/NEFlattenLayerKernel.h" -#include "arm_compute/core/Size2D.h" -#include "support/MemorySupport.h" +#include "arm_compute/core/TensorInfo.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/core/Validate.h" + +#include "src/core/helpers/AutoConfiguration.h" +#include "src/cpu/operators/CpuFlatten.h" namespace arm_compute { +struct NEFlattenLayer::Impl +{ + const ITensor *src{nullptr}; + ITensor *dst{nullptr}; + std::unique_ptr<cpu::CpuFlatten> op{nullptr}; +}; + +NEFlattenLayer::NEFlattenLayer() : _impl(std::make_unique<Impl>()) +{ +} +NEFlattenLayer::NEFlattenLayer(NEFlattenLayer &&) = default; +NEFlattenLayer &NEFlattenLayer::operator=(NEFlattenLayer &&) = default; +NEFlattenLayer::~NEFlattenLayer() = default; + void NEFlattenLayer::configure(const ITensor *input, ITensor *output) { - auto k = arm_compute::support::cpp14::make_unique<NEFlattenLayerKernel>(); - k->configure(input, output); - _kernel = std::move(k); + ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); + _impl->src = input; + _impl->dst = output; + auto_init_if_empty(*output->info(), input->info()->clone()->set_tensor_shape( + misc::shape_calculator::compute_flatten_shape(input->info()))); + + _impl->op = std::make_unique<cpu::CpuFlatten>(); + _impl->op->configure(_impl->src->info(), _impl->dst->info()); } Status NEFlattenLayer::validate(const ITensorInfo *input, const ITensorInfo *output) { - return NEFlattenLayerKernel::validate(input, output); + // Checks performed when output is configured + if (output->total_size() != 0) + { + const TensorInfo tensor_info_output = + input->clone()->set_tensor_shape(misc::shape_calculator::compute_flatten_shape(input)); + ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_SHAPES(output, &tensor_info_output); + } + return cpu::CpuFlatten::validate(input, output); +} +void NEFlattenLayer::run() +{ + ITensorPack pack; + pack.add_tensor(TensorType::ACL_SRC, _impl->src); + pack.add_tensor(TensorType::ACL_DST, _impl->dst); + _impl->op->run(pack); } } // namespace arm_compute |