COMPMID-1582 Add YOLOLayer to graph API

Change-Id: I8eb7cf220f038b0ac70cb3df1f399a3b66bbca1b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148245
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: bsgcomp <bsgcomp@arm.com>

9 files changed, 172 insertions, 0 deletions

diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h
index 21a96a36c0..21c85b5667 100644
--- a/arm_compute/graph/GraphBuilder.h
+++ b/arm_compute/graph/GraphBuilder.h
@@ -340,6 +340,17 @@ public:
      * @return Node ID of the created node, EmptyNodeID in case of error
      */
     static NodeID add_split_node(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_splits, unsigned int axis = 0);
+    /** Adds a yolo layer to the graph
+     *
+     * @param[in] g           Graph to add the node to
+     * @param[in] params      Common node parameters
+     * @param[in] input       Input to the yolo layer node as a NodeID-Index pair
+     * @param[in] act_info    Activation layer parameters
+     * @param[in] num_classes Number of classes to activate
+     *
+     * @return Node ID of the created node, EmptyNodeID in case of error
+     */
+    static NodeID add_yolo_node(Graph &g, NodeParams params, NodeIdxPair input, ActivationLayerInfo act_info, int32_t num_classes);
 };
 } // namespace graph
 } // namespace arm_compute
diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h
index 4628d924dc..0d111691d3 100644
--- a/arm_compute/graph/TypePrinter.h
+++ b/arm_compute/graph/TypePrinter.h
@@ -119,6 +119,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type)
         case NodeType::SplitLayer:
             os << "SplitLayer";
             break;
+        case NodeType::YOLOLayer:
+            os << "YOLOLayer";
+            break;
         case NodeType::Input:
             os << "Input";
             break;
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index 190258bf6c..cc3e346b12 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -149,6 +149,7 @@ enum class NodeType
     ResizeLayer,
     SoftmaxLayer,
     SplitLayer,
+    YOLOLayer,
 
     Input,
     Output,
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index 88d6ce15b9..9ef7226ceb 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -876,6 +876,46 @@ std::unique_ptr<IFunction> create_softmax_layer(SoftmaxLayerNode &node, GraphCon
 
     return std::move(func);
 }
+/** Create a backend YOLO layer function
+ *
+ * @tparam YoloLayerFunction Backend YOLO function
+ * @tparam TargetInfo        Target-specific information
+ *
+ * @param[in] node Node to create the backend function for
+ * @param[in] ctx  Graph context
+ *
+ * @return Backend YOLO layer function
+ */
+template <typename YOLOlayerFunction, typename TargetInfo>
+std::unique_ptr<IFunction> create_yolo_layer(YOLOLayerNode &node, GraphContext &ctx)
+{
+    validate_node<TargetInfo>(node, 1 /* expected inputs */, 1 /* expected outputs */);
+
+    // Extract IO and info
+    typename TargetInfo::TensorType *input       = get_backing_tensor<TargetInfo>(node.input(0));
+    typename TargetInfo::TensorType *output      = get_backing_tensor<TargetInfo>(node.output(0));
+    const ActivationLayerInfo        act_info    = node.activation_info();
+    const int32_t                    num_classes = node.num_classes();
+    ARM_COMPUTE_ERROR_ON(num_classes <= 0);
+    ARM_COMPUTE_ERROR_ON(input == nullptr);
+    ARM_COMPUTE_ERROR_ON(output == nullptr);
+
+    // Create and configure function
+    auto func = support::cpp14::make_unique<YOLOlayerFunction>();
+    func->configure(input, output, act_info, num_classes);
+
+    // Log info
+    ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type()
+                               << " Target " << TargetInfo::TargetType
+                               << " Data Type: " << input->info()->data_type()
+                               << " Input shape: " << input->info()->tensor_shape()
+                               << " Output shape: " << output->info()->tensor_shape()
+                               << " Activation function: " << act_info.activation()
+                               << " Num classes: " << num_classes
+                               << std::endl);
+
+    return std::move(func);
+}
 } // namespace detail
 } // namespace backends
 } // namespace graph
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index 1de3aa9a31..eb3762571d 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -248,6 +248,29 @@ Status validate_reorg_layer(ReorgLayerNode &node)
     // Validate function
     return ReorgLayer::validate(input, output, node.stride());
 }
+
+/** Validates a YOLO layer node
+ *
+ * @tparam YOLOLayer YOLO layer type
+ *
+ * @param[in] node Node to validate
+ *
+ * @return Status
+ */
+template <typename YOLOLayer>
+Status validate_yolo_layer(YOLOLayerNode &node)
+{
+    ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating YOLOLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl);
+    ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 1);
+    ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 1);
+
+    // Extract input and output
+    arm_compute::ITensorInfo *input  = detail::get_backing_tensor_info(node.input(0));
+    arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0));
+
+    // Validate function
+    return YOLOLayer::validate(input, output, node.activation_info(), node.num_classes());
+}
 } // namespace detail
 } // namespace backends
 } // namespace graph
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index 9afb1787f3..bbfda9ca82 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -741,6 +741,32 @@ public:
 private:
     float _beta;
 };
+
+/** YOLO Layer */
+class YOLOLayer final : public ILayer
+{
+public:
+    /** Construct a YOLO layer.
+     *
+     * @param[in] act_info    Activation info
+     * @param[in] num_classes Number of classes to activate
+     */
+    YOLOLayer(ActivationLayerInfo act_info, int32_t num_classes)
+        : _act_info(act_info), _num_classes(num_classes)
+    {
+    }
+
+    NodeID create_layer(IStream &s) override
+    {
+        NodeParams  common_params = { name(), s.hints().target_hint };
+        NodeIdxPair input         = { s.tail_node(), 0 };
+        return GraphBuilder::add_yolo_node(s.graph(), common_params, input, _act_info, _num_classes);
+    }
+
+private:
+    ActivationLayerInfo _act_info;
+    int32_t             _num_classes;
+};
 } // namespace frontend
 } // namespace graph
 } // namespace arm_compute
diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h
index 59ac131b8c..92dfa41fc3 100644
--- a/arm_compute/graph/nodes/Nodes.h
+++ b/arm_compute/graph/nodes/Nodes.h
@@ -47,5 +47,6 @@
 #include "arm_compute/graph/nodes/ResizeLayerNode.h"
 #include "arm_compute/graph/nodes/SoftmaxLayerNode.h"
 #include "arm_compute/graph/nodes/SplitLayerNode.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 92dc1f0ebd..c000834a86 100644
--- a/arm_compute/graph/nodes/NodesFwd.h
+++ b/arm_compute/graph/nodes/NodesFwd.h
@@ -53,6 +53,7 @@ class ReshapeLayerNode;
 class ResizeLayerNode;
 class SoftmaxLayerNode;
 class SplitLayerNode;
+class YOLOLayerNode;
 } // namespace graph
 } // namespace arm_compute
 #endif /* __ARM_COMPUTE_GRAPH_NODES_FWD_H__ */
diff --git a/arm_compute/graph/nodes/YOLOLayerNode.h b/arm_compute/graph/nodes/YOLOLayerNode.h
new file mode 100644
index 0000000000..0e02c376e7
--- /dev/null
+++ b/arm_compute/graph/nodes/YOLOLayerNode.h
@@ -0,0 +1,66 @@
+/*
+ * 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_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__ */