From 149203bc23d5c84fe1326d9dea4730750fab6710 Mon Sep 17 00:00:00 2001 From: Dana Zlotnik Date: Wed, 26 Jan 2022 12:38:03 +0200 Subject: Port MaxUnpoolingLayer kernel and add KernelSelect vaidation test Resolves COMPMID-4958 Change-Id: Ibed5155f2e3ece46635f6ea9617bf11cefc402b1 Signed-off-by: Dana Zlotnik Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7028 Tested-by: Arm Jenkins Reviewed-by: Giorgio Arena Comments-Addressed: Arm Jenkins --- src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp | 37 +++++++++++++++++----- 1 file changed, 29 insertions(+), 8 deletions(-) (limited to 'src/runtime/NEON') diff --git a/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp b/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp index 39f717545b..97ddaea41d 100644 --- a/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021 Arm Limited. + * Copyright (c) 2020-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -28,14 +28,23 @@ #include "arm_compute/runtime/NEON/NEScheduler.h" #include "arm_compute/runtime/NEON/functions/NEFill.h" #include "src/common/utils/Log.h" -#include "src/core/NEON/kernels/NEMaxUnpoolingLayerKernel.h" +#include "src/cpu/kernels/CpuMaxUnpoolingLayerKernel.h" +#include "src/cpu/operators/CpuMaxUnpooling.h" namespace arm_compute { +struct NEMaxUnpoolingLayer::Impl +{ + const ITensor *src{ nullptr }; + const ITensor *indices{ nullptr }; + ITensor *dst{ nullptr }; + std::unique_ptr op{ nullptr }; +}; + NEMaxUnpoolingLayer::~NEMaxUnpoolingLayer() = default; NEMaxUnpoolingLayer::NEMaxUnpoolingLayer() - : _fill_func(), _unpooling_layer_kernel() + : _fill_func(), _impl() { } @@ -44,20 +53,32 @@ void NEMaxUnpoolingLayer::configure(ITensor *input, ITensor *indices, ITensor *o ARM_COMPUTE_LOG_PARAMS(input, indices, output, pool_info); const PixelValue zero_value(0.f); - _fill_func = std::make_unique(); - _unpooling_layer_kernel = std::make_unique(); + _fill_func = std::make_unique(); + _impl = std::make_unique(); + _impl->src = input; + _impl->indices = indices; + _impl->dst = output; + + _impl->op = std::make_unique(); _fill_func->configure(output, zero_value); - _unpooling_layer_kernel->configure(input, indices, output, pool_info); + _impl->op->configure(input->info(), indices->info(), output->info(), pool_info); } Status NEMaxUnpoolingLayer::validate(const ITensorInfo *input, const ITensorInfo *indices, const ITensorInfo *output, const PoolingLayerInfo &pool_info) { - return NEMaxUnpoolingLayerKernel::validate(input, indices, output, pool_info); + ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output, indices); + ARM_COMPUTE_RETURN_ON_ERROR(cpu::CpuMaxUnpooling::validate(input, indices, output, pool_info)); + return Status{}; } void NEMaxUnpoolingLayer::run() { + ITensorPack pack; + pack.add_tensor(TensorType::ACL_SRC_0, _impl->src); + pack.add_tensor(TensorType::ACL_SRC_1, _impl->indices); + pack.add_tensor(TensorType::ACL_DST, _impl->dst); + _fill_func->run(); - NEScheduler::get().schedule(_unpooling_layer_kernel.get(), Window::DimY); + _impl->op->run(pack); } } /* namespace arm_compute */ -- cgit v1.2.1