From 27e67f0b2047cfa2f011f9e242e3068d9e106b39 Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Tue, 16 Feb 2021 11:34:39 +0000 Subject: Remove Compute Vision Neon support Resolves COMPMID-4150 Change-Id: I316e8ab97de796666c71eadfde894715fcf4a1aa Signed-off-by: Michalis Spyrou Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5141 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- src/runtime/NEON/functions/NEFastCorners.cpp | 116 --------------------------- 1 file changed, 116 deletions(-) delete mode 100644 src/runtime/NEON/functions/NEFastCorners.cpp (limited to 'src/runtime/NEON/functions/NEFastCorners.cpp') diff --git a/src/runtime/NEON/functions/NEFastCorners.cpp b/src/runtime/NEON/functions/NEFastCorners.cpp deleted file mode 100644 index 5164d80947..0000000000 --- a/src/runtime/NEON/functions/NEFastCorners.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2016-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/NEFastCorners.h" - -#include "arm_compute/core/Error.h" -#include "arm_compute/core/ITensor.h" -#include "arm_compute/core/PixelValue.h" -#include "arm_compute/core/TensorInfo.h" -#include "arm_compute/core/Validate.h" -#include "arm_compute/runtime/Array.h" -#include "arm_compute/runtime/NEON/NEScheduler.h" -#include "arm_compute/runtime/TensorAllocator.h" -#include "src/core/NEON/kernels/NEFastCornersKernel.h" -#include "src/core/NEON/kernels/NEFillArrayKernel.h" -#include "src/core/NEON/kernels/NEFillBorderKernel.h" -#include "src/core/NEON/kernels/NENonMaximaSuppression3x3Kernel.h" - -namespace arm_compute -{ -NEFastCorners::~NEFastCorners() = default; - -NEFastCorners::NEFastCorners(std::shared_ptr memory_manager) - : _memory_group(std::move(memory_manager)), - _fast_corners_kernel(), - _border_handler(), - _nonmax_kernel(), - _fill_kernel(), - _output(), - _suppressed(), - _non_max(false) -{ -} - -void NEFastCorners::configure(IImage *input, float threshold, bool nonmax_suppression, KeyPointArray *corners, - BorderMode border_mode, uint8_t constant_border_value) -{ - ARM_COMPUTE_ERROR_ON_TENSOR_NOT_2D(input); - ARM_COMPUTE_ERROR_ON(BorderMode::UNDEFINED != border_mode); - ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8); - ARM_COMPUTE_ERROR_ON(nullptr == corners); - ARM_COMPUTE_ERROR_ON(threshold < 1 && threshold > 255); - - _non_max = nonmax_suppression; - - TensorInfo tensor_info(input->info()->tensor_shape(), Format::U8); - _output.allocator()->init(tensor_info); - _memory_group.manage(&_output); - - _fast_corners_kernel = std::make_unique(); - _border_handler = std::make_unique(); - _fill_kernel = std::make_unique(); - // If border is UNDEFINED _fast_corners_kernel will operate in xwindow (3, - // width - 3) and ywindow (3, height -3) so the output image will leave the - // pixels on the borders unchanged. This is reflected in the valid region - // of the output. The non maxima suppression is only run on the valid - // pixels. - _fast_corners_kernel->configure(input, &_output, threshold, nonmax_suppression, BorderMode::UNDEFINED == border_mode); - _border_handler->configure(input, _fast_corners_kernel->border_size(), border_mode, constant_border_value); - - if(!_non_max) - { - _fill_kernel->configure(&_output, 1 /* we keep all texels >0 */, corners); - } - else - { - _suppressed.allocator()->init(tensor_info); - _memory_group.manage(&_suppressed); - _nonmax_kernel = std::make_unique(); - _nonmax_kernel->configure(&_output, &_suppressed, BorderMode::UNDEFINED == border_mode); - _fill_kernel->configure(&_suppressed, 1 /* we keep all texels >0 */, corners); - - // Allocate intermediate tensors - _suppressed.allocator()->allocate(); - } - - // Allocate intermediate tensors - _output.allocator()->allocate(); -} - -void NEFastCorners::run() -{ - NEScheduler::get().schedule(_border_handler.get(), Window::DimZ); - - MemoryGroupResourceScope scope_mg(_memory_group); - - NEScheduler::get().schedule(_fast_corners_kernel.get(), Window::DimY); - - if(_non_max) - { - NEScheduler::get().schedule(_nonmax_kernel.get(), Window::DimY); - } - - NEScheduler::get().schedule(_fill_kernel.get(), Window::DimY); -} -} // namespace arm_compute -- cgit v1.2.1