From d64444ba197c2f95dcf4d205f50a196d5a29cdeb Mon Sep 17 00:00:00 2001 From: thecha01 Date: Mon, 7 Sep 2020 14:50:21 +0100 Subject: Add Reduction operation layer node to graph API Signed-off-by: thecha01 Change-Id: Ida819fb8c33790cc9da6d69eeb51e0599269197a Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3931 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- arm_compute/graph/GraphBuilder.h | 12 ++++ arm_compute/graph/TypePrinter.h | 3 + arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 44 +++++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 24 +++++++ arm_compute/graph/frontend/Layers.h | 28 ++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + arm_compute/graph/nodes/ReductionLayerNode.h | 68 +++++++++++++++++++ src/graph/GraphBuilder.cpp | 5 ++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 2 + src/graph/backends/NEON/NEFunctionFactory.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/ReductionLayerNode.cpp | 94 +++++++++++++++++++++++++++ 15 files changed, 289 insertions(+) create mode 100644 arm_compute/graph/nodes/ReductionLayerNode.h create mode 100644 src/graph/nodes/ReductionLayerNode.cpp diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index c78c060d75..f29db3f081 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -447,6 +447,18 @@ public: * @return Node ID of the created node, EmptyNodeID in case of error */ static NodeID add_quantization_node(Graph &g, NodeParams params, NodeIdxPair input, const QuantizationInfo &out_quant_info); + /** Adds a reduction sum 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 reorg layer node as a NodeID-Index pair + * @param[in] op Reduction operation + * @param[in] axis Reduction axis + * @param[in] keep_dims (Optional) Whether to keep the reduced dimension after the operation. Defaults to true. + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_reduction_operation_node(Graph &g, NodeParams params, NodeIdxPair input, ReductionOperation op, int axis, bool keep_dims = true); /** Adds a reorg layer node to the graph * * @param[in] g Graph to add the node to diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h index 738bffaf15..22b96a04c3 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -151,6 +151,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::QuantizationLayer: os << "QuantizationLayer"; break; + case NodeType::ReductionOperationLayer: + os << "ReductionOperationLayer"; + break; case NodeType::ReorgLayer: os << "ReorgLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index b9705d8606..5f851ac67e 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -169,6 +169,7 @@ enum class NodeType PrintLayer, PriorBoxLayer, QuantizationLayer, + ReductionOperationLayer, ReorgLayer, ReshapeLayer, ResizeLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index d8873c0363..e8395e4e92 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -1478,6 +1478,50 @@ std::unique_ptr create_quantization_layer(QuantizationLayerNode &node return RETURN_UNIQUE_PTR(func); } +/** Create a backend reduction operation layer function + * + * @tparam ReductionOperationFunction Backend reduction operation function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * @param[in] ctx Graph context + * + * @return Backend reduction sum layer function + */ +template +std::unique_ptr create_reduction_operation_layer(ReductionLayerNode &node, GraphContext &ctx) +{ + 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)); + ReductionOperation op = node.op(); + int axis = node.axis(); + bool keep_dims = node.keep_dims(); + ARM_COMPUTE_ERROR_ON(input == nullptr); + ARM_COMPUTE_ERROR_ON(output == nullptr); + + // Create and configure function + auto func = support::cpp14::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); + func->configure(input, output, axis, op, keep_dims); + + // 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() + << " Operation: " << op + << " Axis: " << axis + << " Keep dimensions:" << keep_dims + << std::endl); + + return RETURN_UNIQUE_PTR(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 1d5fd92838..dd519fbd5e 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -509,6 +509,30 @@ Status validate_quantization_layer(QuantizationLayerNode &node) return QuantizationLayer::validate(input, output); } +/** Validates a Reduction operation layer node + * + * @tparam ReductionLayer Reduction layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_reduction_operation_layer(ReductionLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating ReductionLayer 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 ReductionLayer::validate(input, output, node.axis(), node.op(), node.keep_dims()); +} + /** 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 ba303a3ef6..74c40126c8 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -1133,6 +1133,34 @@ private: QuantizationInfo _out_quant_info; }; +/** Reduction Layer */ +class ReductionLayer final : public ILayer +{ +public: + /** Construct a reduction layer. + * + * @param[in] op Reduction operation + * @param[in] axis Reduction axis + * @param[in] keep_dims (Optional) Whether to keep the reduced dimension after the operation. Defaults to true. + */ + ReductionLayer(ReductionOperation op, unsigned int axis, bool keep_dims) + : _op(op), _axis(axis), _keep_dims(keep_dims) + { + } + + NodeID create_layer(IStream &s) override + { + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair input = { s.tail_node(), 0 }; + return GraphBuilder::add_reduction_operation_node(s.graph(), common_params, input, _op, _axis, _keep_dims); + } + +private: + ReductionOperation _op; + unsigned int _axis; + bool _keep_dims; +}; + /** Reorg Layer */ class ReorgLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 967b65ff9c..a6c569af88 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -58,6 +58,7 @@ #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/ReductionLayerNode.h" #include "arm_compute/graph/nodes/ReorgLayerNode.h" #include "arm_compute/graph/nodes/ReshapeLayerNode.h" #include "arm_compute/graph/nodes/ResizeLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 9326d4ff79..cf8fc4f37c 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -63,6 +63,7 @@ class PReluLayerNode; class PrintLayerNode; class PriorBoxLayerNode; class QuantizationLayerNode; +class ReductionLayerNode; class ReorgLayerNode; class ReshapeLayerNode; class ResizeLayerNode; diff --git a/arm_compute/graph/nodes/ReductionLayerNode.h b/arm_compute/graph/nodes/ReductionLayerNode.h new file mode 100644 index 0000000000..b8d295945c --- /dev/null +++ b/arm_compute/graph/nodes/ReductionLayerNode.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2020 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_REDUCTION_LAYER_NODE_H +#define ARM_COMPUTE_GRAPH_REDUCTION_LAYER_NODE_H + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** Reduction Operation node */ +class ReductionLayerNode final : public INode +{ +public: + /** Default Constructor */ + ReductionLayerNode(ReductionOperation op, unsigned int axis, bool keep_dims = true); + /** op accessor + * + * @return op + */ + ReductionOperation op() const; + /** axis accessor + * + * @return axis + */ + unsigned int axis() const; + /** keep_dims accessor + * + * @return keep_dims + */ + bool keep_dims() 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: + ReductionOperation _op; + unsigned int _axis; + bool _keep_dims; +}; +} // namespace graph +} // namespace arm_compute +#endif /* ARM_COMPUTE_GRAPH_REDUCTION_LAYER_NODE_H */ diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 33b7c178e5..2f74f065d5 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -642,6 +642,11 @@ NodeID GraphBuilder::add_quantization_node(Graph &g, NodeParams params, NodeIdxP return create_simple_single_input_output_node(g, params, input, out_quant_info); } +NodeID GraphBuilder::add_reduction_operation_node(Graph &g, NodeParams params, NodeIdxPair input, ReductionOperation op, int axis, bool keep_dims) +{ + return create_simple_single_input_output_node(g, params, input, op, axis, keep_dims); +} + 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 3948400ebf..5f2f46f72a 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -296,6 +296,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_priorbox_layer(*polymorphic_downcast(node)); case NodeType::QuantizationLayer: return detail::create_quantization_layer(*polymorphic_downcast(node)); + case NodeType::ReductionOperationLayer: + return detail::create_reduction_operation_layer(*polymorphic_downcast(node), ctx); 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 c3b4e4646f..8b2ecaf20e 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -100,6 +100,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_priorbox_layer(*polymorphic_downcast(node)); case NodeType::QuantizationLayer: return detail::validate_quantization_layer(*polymorphic_downcast(node)); + case NodeType::ReductionOperationLayer: + return detail::validate_reduction_operation_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 686468e0a4..61df45d8d0 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -183,6 +183,8 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & return detail::create_priorbox_layer(*polymorphic_downcast(node)); case NodeType::QuantizationLayer: return detail::create_quantization_layer(*polymorphic_downcast(node)); + case NodeType::ReductionOperationLayer: + return detail::create_reduction_operation_layer(*polymorphic_downcast(node), ctx); 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 0d6305b29e..19c96eab50 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -100,6 +100,8 @@ Status NENodeValidator::validate(INode *node) return detail::validate_priorbox_layer(*polymorphic_downcast(node)); case NodeType::QuantizationLayer: return detail::validate_quantization_layer(*polymorphic_downcast(node)); + case NodeType::ReductionOperationLayer: + return detail::validate_reduction_operation_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: diff --git a/src/graph/nodes/ReductionLayerNode.cpp b/src/graph/nodes/ReductionLayerNode.cpp new file mode 100644 index 0000000000..0e93039894 --- /dev/null +++ b/src/graph/nodes/ReductionLayerNode.cpp @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2020 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/ReductionLayerNode.h" + +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" +#include "arm_compute/graph/Utils.h" + +namespace arm_compute +{ +namespace graph +{ +ReductionLayerNode::ReductionLayerNode(ReductionOperation op, unsigned int axis, bool keep_dims) + : _op(op), _axis(axis), _keep_dims(keep_dims) +{ + _input_edges.resize(1, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +ReductionOperation ReductionLayerNode::op() const +{ + return _op; +} + +unsigned int ReductionLayerNode::axis() const +{ + return _axis; +} + +bool ReductionLayerNode::keep_dims() const +{ + return _keep_dims; +} + +bool ReductionLayerNode::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 ReductionLayerNode::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(); + TensorShape output_shape = arm_compute::misc::shape_calculator::compute_reduced_shape(output_info.shape, _axis, _keep_dims); + output_info.set_shape(output_shape); + + return output_info; +} + +NodeType ReductionLayerNode::type() const +{ + return NodeType::ReductionOperationLayer; +} + +void ReductionLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute \ No newline at end of file -- cgit v1.2.1