From 0b1c2db5c29ed80b7f4dd0c4fd6d4ed91b3d1538 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 4 Dec 2020 15:51:34 +0000 Subject: Remove (NE/CL)YoloLayer support YOLO layer is too specialized and specific to a single model type. Can be decomposed using split, activation and concatenate layers Partially Resolves: COMPMID-3996 Signed-off-by: Georgios Pinitas Change-Id: I3cde88f8d4cc7d8c70ce1bb3b32b00f8d09bdca2 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4678 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- tests/validation/fixtures/YOLOLayerFixture.h | 162 --------------------------- 1 file changed, 162 deletions(-) delete mode 100644 tests/validation/fixtures/YOLOLayerFixture.h (limited to 'tests/validation/fixtures/YOLOLayerFixture.h') diff --git a/tests/validation/fixtures/YOLOLayerFixture.h b/tests/validation/fixtures/YOLOLayerFixture.h deleted file mode 100644 index d806c7b745..0000000000 --- a/tests/validation/fixtures/YOLOLayerFixture.h +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (c) 2018 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. - */ -#ifndef ARM_COMPUTE_TEST_YOLO_LAYER_FIXTURE -#define ARM_COMPUTE_TEST_YOLO_LAYER_FIXTURE - -#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/YOLOLayer.h" - -#include - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -template -class YOLOValidationGenericFixture : public framework::Fixture -{ -public: - template - void setup(TensorShape shape, bool in_place, ActivationLayerInfo::ActivationFunction function, float alpha_beta, int32_t num_classes, DataLayout data_layout, DataType data_type, - QuantizationInfo quantization_info) - { - _data_type = data_type; - _function = function; - - ActivationLayerInfo info(function, alpha_beta, alpha_beta); - - _target = compute_target(shape, in_place, info, num_classes, data_layout, data_type, quantization_info); - _reference = compute_reference(shape, info, num_classes, data_type, quantization_info); - } - -protected: - template - void fill(U &&tensor) - { - float min_bound = 0; - float max_bound = 0; - std::tie(min_bound, max_bound) = get_activation_layer_test_bounds(_function, _data_type); - std::uniform_real_distribution<> distribution(min_bound, max_bound); - library->fill(tensor, distribution, 0); - } - - TensorType compute_target(TensorShape shape, bool in_place, const ActivationLayerInfo &info, int32_t num_classes, DataLayout data_layout, DataType data_type, QuantizationInfo quantization_info) - { - if(data_layout == DataLayout::NHWC) - { - permute(shape, PermutationVector(2U, 0U, 1U)); - } - - // Create tensors - TensorType src = create_tensor(shape, data_type, 1, quantization_info, data_layout); - TensorType dst = create_tensor(shape, data_type, 1, quantization_info, data_layout); - - // Create and configure function - FunctionType yolo_layer; - - TensorType *dst_ptr = in_place ? &src : &dst; - - yolo_layer.configure(&src, dst_ptr, info, num_classes); - - 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(); - ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); - - if(!in_place) - { - dst.allocator()->allocate(); - ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); - } - - // Fill tensors - fill(AccessorType(src)); - - // Compute function - yolo_layer.run(); - - if(in_place) - { - return src; - } - else - { - return dst; - } - } - - SimpleTensor compute_reference(const TensorShape &shape, const ActivationLayerInfo &info, int32_t num_classes, DataType data_type, QuantizationInfo quantization_info) - { - // Create reference - SimpleTensor src{ shape, data_type, 1, quantization_info }; - - // Fill reference - fill(src); - - return reference::yolo_layer(src, info, num_classes); - } - - TensorType _target{}; - SimpleTensor _reference{}; - DataType _data_type{}; - ActivationLayerInfo::ActivationFunction _function{}; -}; - -template -class YOLOValidationFixture : public YOLOValidationGenericFixture -{ -public: - template - void setup(TensorShape shape, bool in_place, ActivationLayerInfo::ActivationFunction function, float alpha_beta, int32_t num_classes, DataLayout data_layout, DataType data_type) - { - YOLOValidationGenericFixture::setup(shape, in_place, function, alpha_beta, num_classes, data_layout, data_type, QuantizationInfo()); - } -}; - -template -class YOLOValidationQuantizedFixture : public YOLOValidationGenericFixture -{ -public: - template - void setup(TensorShape shape, bool in_place, ActivationLayerInfo::ActivationFunction function, float alpha_beta, int32_t num_classes, DataLayout data_layout, DataType data_type, - QuantizationInfo quantization_info) - { - YOLOValidationGenericFixture::setup(shape, in_place, function, alpha_beta, num_classes, data_layout, data_type, quantization_info); - } -}; -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif // ARM_COMPUTE_TEST_YOLO_LAYER_FIXTURE -- cgit v1.2.1