COMPMID-2362: Add Quantization Layer to the graph API

Change-Id: I9766ad54e8da1367ba192dfeeccdc879f3729550
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1172
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

10 files changed, 165 insertions, 0 deletions

diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h
index 1d6ecc83ed..048c693639 100644
--- a/arm_compute/graph/GraphBuilder.h
+++ b/arm_compute/graph/GraphBuilder.h
@@ -354,6 +354,16 @@ public:
      * @return Node ID of the created node, EmptyNodeID in case of error
      */
     static NodeID add_priorbox_node(Graph &g, NodeParams params, NodeIdxPair input0, NodeIdxPair input1, const PriorBoxLayerInfo &prior_info);
+    /** Adds a quantization layer node to the graph
+     *
+     * @param[in] g              Graph to add the node to
+     * @param[in] params         Common node parameters
+     * @param[in] input          Input to the quantization layer node as a NodeID-Index pair
+     * @param[in] out_quant_info Output quantization info
+     *
+     * @return Node ID of the created node, EmptyNodeID in case of error
+     */
+    static NodeID add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, QuantizationInfo out_quant_info);
     /** Adds a reorg layer node to the graph
      *
      * @param[in] g      Graph to add the node to
diff --git a/arm_compute/graph/INodeVisitor.h b/arm_compute/graph/INodeVisitor.h
index 291fe7c3cc..be43b57e48 100644
--- a/arm_compute/graph/INodeVisitor.h
+++ b/arm_compute/graph/INodeVisitor.h
@@ -126,6 +126,11 @@ public:
      * @param[in] n Node to visit.
      */
     virtual void visit(PriorBoxLayerNode &n) = 0;
+    /** Visit QuantizationLayerNode.
+     *
+     * @param[in] n Node to visit.
+     */
+    virtual void visit(QuantizationLayerNode &n) = 0;
     /** Visit ReshapeLayerNode.
      *
      * @param[in] n Node to visit.
@@ -233,6 +238,10 @@ public:
     {
         default_visit();
     }
+    virtual void visit(QuantizationLayerNode &n) override
+    {
+        default_visit();
+    }
     virtual void visit(ReshapeLayerNode &n) override
     {
         default_visit();
diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h
index 29a2981463..4fb5b73333 100644
--- a/arm_compute/graph/TypePrinter.h
+++ b/arm_compute/graph/TypePrinter.h
@@ -122,6 +122,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type)
         case NodeType::PriorBoxLayer:
             os << "PriorBoxLayer";
             break;
+        case NodeType::QuantizationLayer:
+            os << "QuantizationLayer";
+            break;
         case NodeType::ReorgLayer:
             os << "ReorgLayer";
             break;
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index 4d9e031b91..2f09abbbab 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -148,6 +148,7 @@ enum class NodeType
     PermuteLayer,
     PoolingLayer,
     PriorBoxLayer,
+    QuantizationLayer,
     ReorgLayer,
     ReshapeLayer,
     ResizeLayer,
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index f6e6286a19..785f6dc3b9 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -1045,6 +1045,43 @@ std::unique_ptr<IFunction> create_priorbox_layer(PriorBoxLayerNode &node)
     return std::move(func);
 }
 
+/** Create a backend quantization layer function
+ *
+ * @tparam QuantizationLayerFunction Backend quantization function
+ * @tparam TargetInfo                Target-specific information
+ *
+ * @param[in] node Node to create the backend function for
+ *
+ * @return Backend quantization layer function
+ */
+template <typename QuantizationLayerFunction, typename TargetInfo>
+std::unique_ptr<IFunction> create_quantization_layer(QuantizationLayerNode &node)
+{
+    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));
+    ARM_COMPUTE_ERROR_ON(input == nullptr);
+    ARM_COMPUTE_ERROR_ON(output == nullptr);
+
+    // Create and configure function
+    auto func = support::cpp14::make_unique<QuantizationLayerFunction>();
+    func->configure(input, output);
+
+    // Log info
+    ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated "
+                               << node.name()
+                               << " Type: " << node.type()
+                               << " Target: " << TargetInfo::TargetType
+                               << " Data Type: " << input->info()->data_type()
+                               << " Input shape: " << input->info()->tensor_shape()
+                               << " Output shape: " << output->info()->tensor_shape()
+                               << std::endl);
+
+    return std::move(func);
+}
+
 /** Create a backend reorg layer function
  *
  * @tparam ReorgLayerFunction Backend reorg function
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index dbf8f35121..3a5686336b 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -350,6 +350,29 @@ Status validate_priorbox_layer(PriorBoxLayerNode &node)
     return PriorBoxLayer::validate(input0, input1, output, prior_info);
 }
 
+/** Validates a Quantization layer node
+ *
+ * @tparam QuantizationLayer Quantization layer type
+ *
+ * @param[in] node Node to validate
+ *
+ * @return Status
+ */
+template <typename QuantizationLayer>
+Status validate_quantization_layer(QuantizationLayerNode &node)
+{
+    ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating QuantizationLayer 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 QuantizationLayer::validate(input, output);
+}
+
 /** Validates a Reorg layer node
  *
  * @tparam ReorgLayer Reorg layer type
diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h
index a4c03a68a0..f73b1f49d9 100644
--- a/arm_compute/graph/frontend/Layers.h
+++ b/arm_compute/graph/frontend/Layers.h
@@ -856,6 +856,30 @@ private:
     PriorBoxLayerInfo _prior_info;
 };
 
+/** Quantization Layer */
+class QuantizationLayer final : public ILayer
+{
+public:
+    /** Construct a quantization layer.
+     *
+     * @param[in] out_quant_info Output tensor quantization info
+     */
+    QuantizationLayer(QuantizationInfo out_quant_info)
+        : _out_quant_info(out_quant_info)
+    {
+    }
+
+    NodeID create_layer(IStream &s) override
+    {
+        NodeParams  common_params = { name(), s.hints().target_hint };
+        NodeIdxPair input         = { s.tail_node(), 0 };
+        return GraphBuilder::add_quantization_node(s.graph(), common_params, input, _out_quant_info);
+    }
+
+private:
+    QuantizationInfo _out_quant_info;
+};
+
 /** Reorg Layer */
 class ReorgLayer final : public ILayer
 {
diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h
index 4eb6a0f886..c891bc2ca2 100644
--- a/arm_compute/graph/nodes/Nodes.h
+++ b/arm_compute/graph/nodes/Nodes.h
@@ -48,6 +48,7 @@
 #include "arm_compute/graph/nodes/PermuteLayerNode.h"
 #include "arm_compute/graph/nodes/PoolingLayerNode.h"
 #include "arm_compute/graph/nodes/PriorBoxLayerNode.h"
+#include "arm_compute/graph/nodes/QuantizationLayerNode.h"
 #include "arm_compute/graph/nodes/ROIAlignLayerNode.h"
 #include "arm_compute/graph/nodes/ReorgLayerNode.h"
 #include "arm_compute/graph/nodes/ReshapeLayerNode.h"
diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h
index 06c2e1f1ae..0f3450b08f 100644
--- a/arm_compute/graph/nodes/NodesFwd.h
+++ b/arm_compute/graph/nodes/NodesFwd.h
@@ -54,6 +54,7 @@ class PadLayerNode;
 class PermuteLayerNode;
 class PoolingLayerNode;
 class PriorBoxLayerNode;
+class QuantizationLayerNode;
 class ReorgLayerNode;
 class ReshapeLayerNode;
 class ResizeLayerNode;
diff --git a/arm_compute/graph/nodes/QuantizationLayerNode.h b/arm_compute/graph/nodes/QuantizationLayerNode.h
new file mode 100644
index 0000000000..48f5f7c10a
--- /dev/null
+++ b/arm_compute/graph/nodes/QuantizationLayerNode.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 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_QUANTIZATION_LAYER_NODE_H__
+#define __ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H__
+
+#include "arm_compute/graph/INode.h"
+
+namespace arm_compute
+{
+namespace graph
+{
+/** Quantization Layer node */
+class QuantizationLayerNode final : public INode
+{
+public:
+    /** Constructor
+     *
+     * @param[in] out_quant_info Output quantization info
+     */
+    QuantizationLayerNode(QuantizationInfo out_quant_info);
+
+    // Inherited overridden methods:
+    NodeType         type() const override;
+    bool             forward_descriptors() override;
+    TensorDescriptor configure_output(size_t idx) const override;
+    void accept(INodeVisitor &v) override;
+
+    static constexpr NodeType node_type = NodeType::QuantizationLayer;
+
+private:
+    QuantizationInfo _out_quant_info;
+};
+} // namespace graph
+} // namespace arm_compute
+#endif /* __ARM_COMPUTE_GRAPH_QUANTIZATION_LAYER_NODE_H__ */