From c53266e45f3c8c07dff88c61e5bfa01c6d3ba3f0 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 9 Dec 2020 03:11:53 +0000 Subject: Remove (CL/NE)UpsampleLayer in favor to (NE/CL)Scale Upsample functions and kernels can be replaced with the Scale as they provide same functionality Partially resolves: COMPMID-3996 Signed-off-by: Georgios Pinitas Change-Id: Ic2f9ba352c183aa87d69d551d5c172d0f22119e8 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4679 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/core/NEON/kernels/NEUpsampleLayerKernel.cpp | 276 ------------------------ 1 file changed, 276 deletions(-) delete mode 100644 src/core/NEON/kernels/NEUpsampleLayerKernel.cpp (limited to 'src/core/NEON/kernels/NEUpsampleLayerKernel.cpp') diff --git a/src/core/NEON/kernels/NEUpsampleLayerKernel.cpp b/src/core/NEON/kernels/NEUpsampleLayerKernel.cpp deleted file mode 100644 index cbdec50a42..0000000000 --- a/src/core/NEON/kernels/NEUpsampleLayerKernel.cpp +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Copyright (c) 2018-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 "src/core/NEON/kernels/NEUpsampleLayerKernel.h" - -#include "arm_compute/core/Error.h" -#include "arm_compute/core/Helpers.h" -#include "arm_compute/core/ITensor.h" -#include "arm_compute/core/TensorInfo.h" -#include "arm_compute/core/Validate.h" -#include "arm_compute/core/Window.h" -#include "arm_compute/core/utils/misc/ShapeCalculator.h" -#include "src/core/CPP/Validate.h" -#include "src/core/NEON/wrapper/wrapper.h" -#include "src/core/helpers/AutoConfiguration.h" -#include "src/core/helpers/WindowHelpers.h" - -#include - -namespace arm_compute -{ -namespace -{ -template -inline T get_data_out(T data, int offset) -{ - T out{ 0 }; - for(int i = 0; i < S / 2; ++i) - { - out[2 * i] = wrapper::vgetlane(data, i + offset); - out[2 * i + 1] = wrapper::vgetlane(data, i + offset); - } - return out; -} -} // namespace -NEUpsampleLayerKernel::NEUpsampleLayerKernel() - : _func(nullptr), _input(nullptr), _output(nullptr), _info() -{ -} - -Status NEUpsampleLayerKernel::validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &info, const InterpolationPolicy policy) -{ - ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, output); - ARM_COMPUTE_UNUSED(policy); - - const DataLayout data_layout = input->data_layout(); - const int idx_width = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); - const int idx_height = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); - - ARM_COMPUTE_RETURN_ERROR_ON_CPU_F16_UNSUPPORTED(input); - ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8_SIGNED, DataType::QASYMM8, DataType::F16, DataType::F32); - ARM_COMPUTE_RETURN_ERROR_ON_MSG(info.x() != 2 || info.y() != 2, "Only stride 2 is supported"); - ARM_COMPUTE_RETURN_ERROR_ON_MSG(policy != InterpolationPolicy::NEAREST_NEIGHBOR, "Only nearest neighbor policy supported"); - - // Check output if configured - if(output->total_size() != 0) - { - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_LAYOUT(input, output); - ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(idx_width) != info.x() * input->dimension(idx_width)); - ARM_COMPUTE_RETURN_ERROR_ON(output->dimension(idx_height) != info.y() * input->dimension(idx_height)); - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_QUANTIZATION_INFO(input, output); - } - return Status{}; -} - -template -void NEUpsampleLayerKernel::upsample_nchw(const arm_compute::Window &window) -{ - using VectorType = typename wrapper::traits::neon_vector::type; - - Window window_in(window); - window_in.set(Window::DimX, Window::Dimension(0, 1, 1)); - - Window window_out(window); - window_out.set(Window::DimX, Window::Dimension(0, 1, 1)); - window_out.set(Window::DimY, Window::Dimension(0, _output->info()->dimension(1), _info.y())); - - const auto window_start_x = static_cast(window.x().start()); - const auto window_end_x = static_cast(window.x().end()); - const int window_step_x = S; - - Iterator input(_input, window_in); - Iterator output(_output, window_out); - const int offset_y_out = _output->info()->strides_in_bytes().y() / sizeof(T); - - execute_window_loop(window_out, [&](const Coordinates &) - { - const auto input_ptr = reinterpret_cast(input.ptr()); - const auto output_ptr = reinterpret_cast(output.ptr()); - - int x = window_start_x; - for(; x <= (window_end_x - window_step_x); x += window_step_x) - { - const VectorType data = wrapper::vloadq(reinterpret_cast(input_ptr + x)); - const VectorType data_out1 = get_data_out(data, 0); - const VectorType data_out2 = get_data_out(data, S / 2); - - wrapper::vstore(output_ptr + 2 * x, data_out1); - wrapper::vstore(output_ptr + 2 * x + S, data_out2); - wrapper::vstore(output_ptr + 2 * x + offset_y_out, data_out1); - wrapper::vstore(output_ptr + 2 * x + offset_y_out + S, data_out2); - } - - // Compute left-over elements - for(; x < window_end_x; ++x) - { - *(output_ptr + 2 * x) = *(input_ptr + x); - *(output_ptr + 2 * x + 1) = *(input_ptr + x); - *(output_ptr + 2 * x + offset_y_out) = *(input_ptr + x); - *(output_ptr + 2 * x + offset_y_out + 1) = *(input_ptr + x); - } - }, - input, output); -} - -template -void NEUpsampleLayerKernel::upsample_nhwc(const arm_compute::Window &window) -{ - using VectorType = typename wrapper::traits::neon_vector::type; - - Window window_out(window); - window_out.set(Window::DimX, Window::Dimension(0, 1, 1)); - window_out.set(Window::DimY, Window::Dimension(0, _output->info()->dimension(1), _info.x())); - window_out.set(Window::DimZ, Window::Dimension(0, _output->info()->dimension(2), _info.y())); - - const auto window_start_x = static_cast(window.x().start()); - const auto window_end_x = static_cast(window.x().end()); - const int window_step_x = S; - - Window window_in{ window }; - window_in.set(Window::DimX, Window::Dimension(0, 1, 1)); - - Iterator input(_input, window_in); - Iterator output(_output, window_out); - - const int offset_y_out = _output->info()->strides_in_bytes().y() / sizeof(T); - const int offset_z_out = _output->info()->strides_in_bytes().z() / sizeof(T); - - execute_window_loop(window_out, [&](const Coordinates &) - { - const auto input_ptr = reinterpret_cast(input.ptr()); - const auto output_ptr = reinterpret_cast(output.ptr()); - - int x = window_start_x; - for(; x <= (window_end_x - window_step_x); x += window_step_x) - { - const VectorType data = wrapper::vloadq(reinterpret_cast(input_ptr + x)); - - wrapper::vstore(output_ptr + x, data); - wrapper::vstore(output_ptr + x + offset_y_out, data); - wrapper::vstore(output_ptr + x + offset_z_out, data); - wrapper::vstore(output_ptr + x + offset_y_out + offset_z_out, data); - } - - // Compute left-over elements - for(; x < window_end_x; ++x) - { - *(output_ptr + x) = *(input_ptr + x); - *(output_ptr + x + offset_y_out) = *(input_ptr + x); - *(output_ptr + x + offset_z_out) = *(input_ptr + x); - *(output_ptr + x + offset_y_out + offset_z_out) = *(input_ptr + x); - } - }, - input, output); -} - -void NEUpsampleLayerKernel::configure(const ITensor *input, ITensor *output, const Size2D &info, const InterpolationPolicy policy) -{ - ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); - ARM_COMPUTE_UNUSED(policy); - - _input = input; - _output = output; - _info = info; - - const DataLayout data_layout = input->info()->data_layout(); - - TensorShape output_shape = misc::shape_calculator::compute_upsample_shape(*input->info(), info); - auto_init_if_empty(*output->info(), output_shape, 1, input->info()->data_type()); - output->info()->set_data_layout(data_layout); - - // Perform validation step - ARM_COMPUTE_ERROR_THROW_ON(NEUpsampleLayerKernel::validate(input->info(), output->info(), info, policy)); - - switch(data_layout) - { - case DataLayout::NCHW: - { - switch(input->info()->data_type()) - { - case DataType::QASYMM8_SIGNED: - _func = &NEUpsampleLayerKernel::upsample_nchw; - break; - case DataType::QASYMM8: - _func = &NEUpsampleLayerKernel::upsample_nchw; - break; - case DataType::F32: - _func = &NEUpsampleLayerKernel::upsample_nchw; - break; -#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC - case DataType::F16: - _func = &NEUpsampleLayerKernel::upsample_nchw; - ; - break; -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ - default: - ARM_COMPUTE_ERROR("Not implemented"); - } - break; - } - case DataLayout::NHWC: - { - switch(input->info()->data_type()) - { - case DataType::QASYMM8_SIGNED: - _func = &NEUpsampleLayerKernel::upsample_nhwc; - break; - case DataType::QASYMM8: - _func = &NEUpsampleLayerKernel::upsample_nhwc; - break; - case DataType::F32: - _func = &NEUpsampleLayerKernel::upsample_nhwc; - break; -#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC - case DataType::F16: - _func = &NEUpsampleLayerKernel::upsample_nhwc; - break; -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ - default: - ARM_COMPUTE_ERROR("Not implemented"); - } - break; - } - default: - ARM_COMPUTE_ERROR("Not implemented"); - } - - // Configure window - Window win = calculate_max_window(*input->info(), Steps()); - Coordinates coord; - coord.set_num_dimensions(output->info()->num_dimensions()); - output->info()->set_valid_region(ValidRegion(coord, output->info()->tensor_shape())); - INEKernel::configure(win); -} - -void NEUpsampleLayerKernel::run(const Window &window, const ThreadInfo &info) -{ - ARM_COMPUTE_UNUSED(info); - ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); - ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(INEKernel::window(), window); - ARM_COMPUTE_ERROR_ON(_func == nullptr); - - (this->*_func)(window); -} -} // namespace arm_compute -- cgit v1.2.1