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 --- tests/validation/fixtures/UpsampleLayerFixture.h | 148 ----------------------- 1 file changed, 148 deletions(-) delete mode 100644 tests/validation/fixtures/UpsampleLayerFixture.h (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/UpsampleLayerFixture.h b/tests/validation/fixtures/UpsampleLayerFixture.h deleted file mode 100644 index f7ec91f44a..0000000000 --- a/tests/validation/fixtures/UpsampleLayerFixture.h +++ /dev/null @@ -1,148 +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 "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "tests/AssetsLibrary.h" -#include "tests/Globals.h" -#include "tests/IAccessor.h" -#include "tests/framework/Asserts.h" -#include "tests/framework/Fixture.h" -#include "tests/validation/Helpers.h" -#include "tests/validation/reference/UpsampleLayer.h" - -#include - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -template -class UpsampleLayerFixtureBase : public framework::Fixture -{ -public: - template - void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &policy, QuantizationInfo quantization_info) - { - _data_type = data_type; - - _target = compute_target(input_shape, info, policy, data_type, data_layout, quantization_info); - _reference = compute_reference(input_shape, info, policy, data_type, quantization_info); - } - -protected: - template - void fill(U &&tensor, int i) - { - library->fill_tensor_uniform(tensor, i); - } - - TensorType compute_target(TensorShape input_shape, const Size2D &info, const InterpolationPolicy &policy, - DataType data_type, DataLayout data_layout, QuantizationInfo quantization_info) - { - TensorShape output_shape(input_shape); - output_shape.set(0, info.x() * input_shape[0]); - output_shape.set(1, info.y() * input_shape[1]); - - if(data_layout == DataLayout::NHWC) - { - permute(input_shape, PermutationVector(2U, 0U, 1U)); - permute(output_shape, PermutationVector(2U, 0U, 1U)); - } - - // Create tensors - TensorType src = create_tensor(input_shape, data_type, 1, quantization_info, data_layout); - TensorType dst = create_tensor(output_shape, data_type, 1, quantization_info, data_layout); - - // Create and configure function - FunctionType upsample; - upsample.configure(&src, &dst, info, policy); - - ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Allocate tensors - src.allocator()->allocate(); - dst.allocator()->allocate(); - - ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); - - // Fill tensors - fill(AccessorType(src), 0); - - // Compute DeconvolutionLayer function - upsample.run(); - - return dst; - } - - SimpleTensor compute_reference(const TensorShape &input_shape, const Size2D &info, const InterpolationPolicy &policy, - DataType data_type, QuantizationInfo quantization_info) - { - // Create reference - SimpleTensor src{ input_shape, data_type, 1, quantization_info }; - - // Fill reference - fill(src, 0); - - return reference::upsample_layer(src, info, policy); - } - - TensorType _target{}; - SimpleTensor _reference{}; - DataType _data_type{}; -}; - -template -class UpsampleLayerFixture : public UpsampleLayerFixtureBase -{ -public: - template - void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &policy) - { - UpsampleLayerFixtureBase::setup(input_shape, data_type, data_layout, - info, policy, QuantizationInfo()); - } -}; - -template -class UpsampleLayerQuantizedFixture : public UpsampleLayerFixtureBase -{ -public: - template - void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &policy, QuantizationInfo quantization_info) - { - UpsampleLayerFixtureBase::setup(input_shape, data_type, data_layout, - info, policy, quantization_info); - } -}; - -} // namespace validation -} // namespace test -} // namespace arm_compute -- cgit v1.2.1