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 --- arm_compute/graph/nodes/Nodes.h | 1 - arm_compute/graph/nodes/NodesFwd.h | 1 - arm_compute/graph/nodes/SliceLayerNode.h | 4 +- arm_compute/graph/nodes/YOLOLayerNode.h | 66 -------------------------------- 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 arm_compute/graph/nodes/YOLOLayerNode.h (limited to 'arm_compute/graph/nodes') diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index a6c569af88..9a6f982da7 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -68,6 +68,5 @@ #include "arm_compute/graph/nodes/StackLayerNode.h" #include "arm_compute/graph/nodes/StridedSliceLayerNode.h" #include "arm_compute/graph/nodes/UpsampleLayerNode.h" -#include "arm_compute/graph/nodes/YOLOLayerNode.h" #endif /* ARM_COMPUTE_GRAPH_NODES_H */ diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index cf8fc4f37c..b46b5d5f09 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -74,7 +74,6 @@ class SplitLayerNode; class StackLayerNode; class StridedSliceLayerNode; class UpsampleLayerNode; -class YOLOLayerNode; } // namespace graph } // namespace arm_compute #endif /* ARM_COMPUTE_GRAPH_NODES_FWD_H */ diff --git a/arm_compute/graph/nodes/SliceLayerNode.h b/arm_compute/graph/nodes/SliceLayerNode.h index 55f52a78a9..08d3794e26 100644 --- a/arm_compute/graph/nodes/SliceLayerNode.h +++ b/arm_compute/graph/nodes/SliceLayerNode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 Arm Limited. + * Copyright (c) 2018-2020 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -41,7 +41,7 @@ public: * @param[in] starts The starts of the dimensions of the input tensor to be sliced. The length must be of rank(input). * @param[in] ends The ends of the dimensions of the input tensor to be sliced. The length must be of rank(input). */ - SliceLayerNode(Coordinates &starts, Coordinates &ends); + SliceLayerNode(const Coordinates &starts, const Coordinates &ends); /** Computes slice layer output descriptor * * @param[in] input_descriptor Descriptor of the input tensor diff --git a/arm_compute/graph/nodes/YOLOLayerNode.h b/arm_compute/graph/nodes/YOLOLayerNode.h deleted file mode 100644 index f9ced5160a..0000000000 --- a/arm_compute/graph/nodes/YOLOLayerNode.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2018-2019 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_GRAPH_YOLO_LAYER_NODE_H -#define ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H - -#include "arm_compute/graph/INode.h" - -namespace arm_compute -{ -namespace graph -{ -/** YOLO Layer node */ -class YOLOLayerNode final : public INode -{ -public: - /** Constructor - * - * @param[in] act_info Activation info - * @param[in] num_classes Number of classes to activate - */ - YOLOLayerNode(ActivationLayerInfo act_info, int32_t num_classes); - /** Activation metadata accessor - * - * @return The activation info of the layer - */ - ActivationLayerInfo activation_info() const; - /** Number of classes metadata accessor - * - * @return The number of classes to activate of the layer - */ - int32_t num_classes() const; - - // Inherited overridden methods: - NodeType type() const override; - bool forward_descriptors() override; - TensorDescriptor configure_output(size_t idx) const override; - void accept(INodeVisitor &v) override; - -private: - ActivationLayerInfo _act_info; - int32_t _num_classes; -}; -} // namespace graph -} // namespace arm_compute -#endif /* ARM_COMPUTE_GRAPH_YOLO_LAYER_NODE_H */ -- cgit v1.2.1