From 3db1ba9938986e7096184ad22020a71775075d03 Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Fri, 17 May 2019 12:35:20 +0100 Subject: COMPMID-2362: Add Quantization Layer to the graph API Change-Id: I9766ad54e8da1367ba192dfeeccdc879f3729550 Signed-off-by: Isabella Gottardi Reviewed-on: https://review.mlplatform.org/c/1172 Comments-Addressed: Arm Jenkins Reviewed-by: Georgios Pinitas Tested-by: Arm Jenkins --- arm_compute/graph/GraphBuilder.h | 10 +++ arm_compute/graph/INodeVisitor.h | 9 +++ arm_compute/graph/TypePrinter.h | 3 + arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 37 +++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 23 +++++++ arm_compute/graph/frontend/Layers.h | 24 +++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + arm_compute/graph/nodes/QuantizationLayerNode.h | 56 ++++++++++++++++ .../runtime/CL/functions/CLQuantizationLayer.h | 2 +- .../runtime/NEON/functions/NEQuantizationLayer.h | 4 +- src/graph/GraphBuilder.cpp | 5 ++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 2 + src/graph/backends/GLES/GCNodeValidator.cpp | 2 + src/graph/backends/NEON/NEFunctionFactory.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/QuantizationLayerNode.cpp | 77 ++++++++++++++++++++++ 19 files changed, 260 insertions(+), 3 deletions(-) create mode 100644 arm_compute/graph/nodes/QuantizationLayerNode.h create mode 100644 src/graph/nodes/QuantizationLayerNode.cpp 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 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 +std::unique_ptr create_quantization_layer(QuantizationLayerNode &node) +{ + validate_node(node, 1 /* expected inputs */, 1 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *input = get_backing_tensor(node.input(0)); + typename TargetInfo::TensorType *output = get_backing_tensor(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(); + 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 +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__ */ diff --git a/arm_compute/runtime/CL/functions/CLQuantizationLayer.h b/arm_compute/runtime/CL/functions/CLQuantizationLayer.h index 81dcfad515..104f8e2eb2 100644 --- a/arm_compute/runtime/CL/functions/CLQuantizationLayer.h +++ b/arm_compute/runtime/CL/functions/CLQuantizationLayer.h @@ -42,7 +42,7 @@ class CLQuantizationLayer : public ICLSimpleFunction public: /** Set the input and output tensors. * - * @param[in] input Source tensor. Data types supported: F16/32. + * @param[in] input Source tensor. The dimensions over the third will be interpreted as batches. Data types supported: F16/32. * @param[out] output Destination tensor with the same dimensions of input. Output data type must be QASYMM8. */ void configure(const ICLTensor *input, ICLTensor *output); diff --git a/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h b/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h index 9ca199d1ee..5e4b4f754c 100644 --- a/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h +++ b/arm_compute/runtime/NEON/functions/NEQuantizationLayer.h @@ -48,13 +48,13 @@ public: NEQuantizationLayer() = default; /** Set the input and output tensors. * - * @param[in] input Source tensor. The dimensions over the third will be interpreted as batches. Data types supported: F32 + * @param[in] input Source tensor. The dimensions over the third will be interpreted as batches. Data types supported: F32/F16. * @param[out] output Destination tensor with the same dimensions of input. Data types supported: QASYMM8 */ void configure(const ITensor *input, ITensor *output); /** Static function to check if given info will lead to a valid configuration of @ref NEQuantizationLayer * - * @param[in] input Input tensor info. The dimensions over the third will be interpreted as batches. Data types supported: F32. + * @param[in] input Input tensor info. The dimensions over the third will be interpreted as batches. Data types supported: F32/F16. * @param[in] output Output tensor info. Data types supported: QASYMM8 * * @return a status diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 5db9540c75..4626b581ab 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -566,6 +566,11 @@ NodeID GraphBuilder::add_priorbox_node(Graph &g, NodeParams params, NodeIdxPair return prior_nid; } +NodeID GraphBuilder::add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, QuantizationInfo out_quant_info) +{ + return create_simple_single_input_output_node(g, params, input, out_quant_info); +} + NodeID GraphBuilder::add_reorg_node(Graph &g, NodeParams params, NodeIdxPair input, int stride) { return create_simple_single_input_output_node(g, params, input, stride); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 90c1613604..9f8064e924 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -217,6 +217,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_pooling_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: return detail::create_priorbox_layer(*polymorphic_downcast(node)); + case NodeType::QuantizationLayer: + return detail::create_quantization_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::create_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index cb8dc0a172..78771102e8 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -72,6 +72,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_permute_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: return detail::validate_priorbox_layer(*polymorphic_downcast(node)); + case NodeType::QuantizationLayer: + return detail::validate_quantization_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index f15ede6e2c..a767d7b107 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -125,6 +125,8 @@ Status GCNodeValidator::validate(INode *node) return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PermuteLayer"); case NodeType::PriorBoxLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PriorBoxLayer"); + case NodeType::QuantizationLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : QuantizationLayer"); case NodeType::ReorgLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ReorgLayer"); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 690a311408..c31072661b 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -230,6 +230,8 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & return detail::create_pooling_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: return detail::create_priorbox_layer(*polymorphic_downcast(node)); + case NodeType::QuantizationLayer: + return detail::create_quantization_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::create_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 77f2e7f21d..3b1d2aa59c 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -72,6 +72,8 @@ Status NENodeValidator::validate(INode *node) return detail::validate_permute_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: return detail::validate_priorbox_layer(*polymorphic_downcast(node)); + case NodeType::QuantizationLayer: + return detail::validate_quantization_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/nodes/QuantizationLayerNode.cpp b/src/graph/nodes/QuantizationLayerNode.cpp new file mode 100644 index 0000000000..850dd38d3e --- /dev/null +++ b/src/graph/nodes/QuantizationLayerNode.cpp @@ -0,0 +1,77 @@ +/* + * 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. + */ +#include "arm_compute/graph/nodes/QuantizationLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +namespace arm_compute +{ +namespace graph +{ +QuantizationLayerNode::QuantizationLayerNode(QuantizationInfo out_quant_info) + : _out_quant_info(out_quant_info) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +bool QuantizationLayerNode::forward_descriptors() +{ + if((input_id(0) != NullTensorID) && (output_id(0) != NullTensorID)) + { + Tensor *dst = output(0); + ARM_COMPUTE_ERROR_ON(dst == nullptr); + dst->desc() = configure_output(0); + return true; + } + return false; +} + +TensorDescriptor QuantizationLayerNode::configure_output(size_t idx) const +{ + ARM_COMPUTE_UNUSED(idx); + ARM_COMPUTE_ERROR_ON(idx >= _outputs.size()); + + const Tensor *src = input(0); + ARM_COMPUTE_ERROR_ON(src == nullptr); + + TensorDescriptor output_info = src->desc(); + output_info.data_type = DataType::QASYMM8; + output_info.quant_info = _out_quant_info; + + return output_info; +} + +NodeType QuantizationLayerNode::type() const +{ + return QuantizationLayerNode::node_type; +} + +void QuantizationLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1