diff options
author | morgolock <pablo.tello@arm.com> | 2020-04-09 14:17:48 +0100 |
---|---|---|
committer | Pablo Marquez <pablo.tello@arm.com> | 2020-06-15 14:04:49 +0000 |
commit | 37722d9a81627520fa347eb65199dbfeb84b26bd (patch) | |
tree | 3cb811c83e933337e685606625fcd44690b570d7 /src/runtime/NEON/functions | |
parent | 4a61653202afb018f4f259d3c144a735d73f0a20 (diff) | |
download | ComputeLibrary-37722d9a81627520fa347eb65199dbfeb84b26bd.tar.gz |
COMPMID-2449: Implement NEUnPoolLayer
Change-Id: I5677c87bba97dd395a3e13dbce34a3dd2c437033
Signed-off-by: morgolock <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3289
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions')
-rw-r--r-- | src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp | 54 | ||||
-rw-r--r-- | src/runtime/NEON/functions/NEPoolingLayer.cpp | 4 |
2 files changed, 56 insertions, 2 deletions
diff --git a/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp b/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp new file mode 100644 index 0000000000..e606370b0a --- /dev/null +++ b/src/runtime/NEON/functions/NEMaxUnpoolingLayer.cpp @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2020 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "arm_compute/runtime/NEON/functions/NEMaxUnpoolingLayer.h" + +#include "arm_compute/core/ITensor.h" +#include "arm_compute/runtime/NEON/NEScheduler.h" + +namespace arm_compute +{ +NEMaxUnpoolingLayer::NEMaxUnpoolingLayer() + + : _memset_kernel(), _unpooling_layer_kernel() +{ +} + +void NEMaxUnpoolingLayer::configure(ITensor *input, ITensor *indices, ITensor *output, const PoolingLayerInfo &pool_info) +{ + const PixelValue zero_value(0.f); + _memset_kernel.configure(output, zero_value); + _unpooling_layer_kernel.configure(input, indices, output, 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); +} + +void NEMaxUnpoolingLayer::run() +{ + NEScheduler::get().schedule(&_memset_kernel, Window::DimY); + NEScheduler::get().schedule(&_unpooling_layer_kernel, Window::DimY); +} +} /* namespace arm_compute */ diff --git a/src/runtime/NEON/functions/NEPoolingLayer.cpp b/src/runtime/NEON/functions/NEPoolingLayer.cpp index 12921cf40e..fb1b04ab6f 100644 --- a/src/runtime/NEON/functions/NEPoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEPoolingLayer.cpp @@ -49,8 +49,8 @@ void NEPoolingLayer::configure(ITensor *input, ITensor *output, const PoolingLay case DataLayout::NCHW: { // Configure border depending on operation required (quantize border in case of asymmetric data_type) - BorderMode border_mode = (pool_info.pool_type == PoolingType::MAX) ? BorderMode::REPLICATE : BorderMode::CONSTANT; - PixelValue zero_value(0.f); + BorderMode border_mode = (!indices && pool_info.pool_type == PoolingType::MAX) ? BorderMode::REPLICATE : BorderMode::CONSTANT; + PixelValue zero_value((indices) ? std::numeric_limits<int>::min() : 0.f); if(is_data_type_quantized_asymmetric(input->info()->data_type()) && !pool_info.exclude_padding) { zero_value = PixelValue(0, input->info()->data_type(), input->info()->quantization_info()); |