From f8c4749a463106696ab99b6400b92a858a169a19 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 4 Feb 2020 17:39:59 +0000 Subject: COMPMID-3083: Add graph support for PRelu Change-Id: I48492f8c48b818b563bba1e0b48831ac5cdf1420 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2685 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio 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 | 38 ++++++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 26 +++++++++- 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/PReluLayerNode.h | 48 ++++++++++++++++++ src/graph/GraphBuilder.cpp | 14 ++++++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 4 +- src/graph/backends/NEON/NEFunctionFactory.cpp | 2 + src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/nodes/PReluLayerNode.cpp | 71 +++++++++++++++++++++++++++ 16 files changed, 258 insertions(+), 2 deletions(-) create mode 100644 arm_compute/graph/nodes/PReluLayerNode.h create mode 100644 src/graph/nodes/PReluLayerNode.cpp diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 33c222dbd6..23541c4a0f 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -366,6 +366,16 @@ public: * @return Node ID of the created node, EmptyNodeID in case of error */ static NodeID add_pooling_node(Graph &g, NodeParams params, NodeIdxPair input, PoolingLayerInfo pool_info); + /** Adds a prelu 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 PRelu node as a NodeID-Index pair + * @param[in] alpha Alpha input to the PRelu node as a NodeID-Index pair + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_prelu_node(Graph &g, NodeParams params, NodeIdxPair input, NodeIdxPair alpha); /** Adds a print 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 25018d425a..deaa8f1a51 100644 --- a/arm_compute/graph/INodeVisitor.h +++ b/arm_compute/graph/INodeVisitor.h @@ -131,6 +131,11 @@ public: * @param[in] n Node to visit. */ virtual void visit(PermuteLayerNode &n) = 0; + /** Visit PreluLayerNode. + * + * @param[in] n Node to visit. + */ + virtual void visit(PReluLayerNode &n) = 0; /** Visit PoolingLayerNode. * * @param[in] n Node to visit. @@ -266,6 +271,10 @@ public: { default_visit(); } + virtual void visit(PReluLayerNode &) override + { + default_visit(); + } virtual void visit(PrintLayerNode &) override { default_visit(); diff --git a/arm_compute/graph/TypePrinter.h b/arm_compute/graph/TypePrinter.h index 7072b556ae..d56407b52b 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -128,6 +128,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::PoolingLayer: os << "PoolingLayer"; break; + case NodeType::PReluLayer: + os << "PReluLayer"; + break; case NodeType::PrintLayer: os << "PrintLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index 6a488d109a..7c81641cbe 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -153,6 +153,7 @@ enum class NodeType PadLayer, PermuteLayer, PoolingLayer, + PReluLayer, PrintLayer, PriorBoxLayer, QuantizationLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 65a3e15a66..9f352edb9a 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -1149,6 +1149,44 @@ std::unique_ptr create_pooling_layer(PoolingLayerNode &node) return std::move(func); } +/** Create a backend PRelu layer function + * + * @tparam PReluFunction Backend PRelu function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * + * @return Backend PRelu layer function + */ +template +std::unique_ptr create_prelu_layer(PReluLayerNode &node) +{ + validate_node(node, 2 /* expected inputs */, 1 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *input = get_backing_tensor(node.input(0)); + typename TargetInfo::TensorType *alpha = get_backing_tensor(node.input(1)); + typename TargetInfo::TensorType *output = get_backing_tensor(node.output(0)); + ARM_COMPUTE_ERROR_ON(input == nullptr || alpha == nullptr); + ARM_COMPUTE_ERROR_ON(output == nullptr); + + // Create and configure function + auto func = support::cpp14::make_unique(); + func->configure(input, alpha, 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 print layer function * * @tparam TargetInfo Target-specific information diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 66de7ad904..673caf9eac 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -369,6 +369,30 @@ Status validate_permute_layer(PermuteLayerNode &node) return PermuteLayer::validate(input, output, perm); } + +/** Validates a PRelu layer node + * + * @tparam PReluLayer PRelu layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_prelu_layer(PReluLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating PRelu node with ID : " << node.id() << " and Name: " << node.name() << std::endl); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 2); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 1); + + // Extract IO and info + arm_compute::ITensorInfo *input = get_backing_tensor_info(node.input(0)); + arm_compute::ITensorInfo *alpha = get_backing_tensor_info(node.input(1)); + arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0)); + + return PReluLayer::validate(input, alpha, output); +} + /** Validates a priorbox layer node * * @tparam PriorBoxLayer PriorBox layer type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index 2b44d0e844..420f715674 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -902,6 +902,34 @@ private: PoolingLayerInfo _pool_info; }; +/** PRelu Layer */ +class PReluLayer final : public ILayer +{ +public: + /** Construct an PRelu operation layer + * + * @param[in] sub_stream0 First graph sub-stream + * @param[in] sub_stream1 First graph sub-stream + */ + PReluLayer(SubStream &&sub_stream0, SubStream &&sub_stream1) + : _ss0(std::move(sub_stream0)), _ss1(std::move(sub_stream1)) + { + } + + NodeID create_layer(IStream &s) override + { + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair input = { _ss0.tail_node(), 0 }; + NodeIdxPair alpha = { _ss1.tail_node(), 0 }; + + return GraphBuilder::add_prelu_node(s.graph(), common_params, input, alpha); + } + +private: + SubStream _ss0; + SubStream _ss1; +}; + /** Print Layer */ class PrintLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 37cc9e46bd..e8852d247a 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -47,6 +47,7 @@ #include "arm_compute/graph/nodes/NormalizationLayerNode.h" #include "arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h" #include "arm_compute/graph/nodes/OutputNode.h" +#include "arm_compute/graph/nodes/PReluLayerNode.h" #include "arm_compute/graph/nodes/PadLayerNode.h" #include "arm_compute/graph/nodes/PermuteLayerNode.h" #include "arm_compute/graph/nodes/PoolingLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 0fe86b0970..0ccf2433b8 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -56,6 +56,7 @@ class OutputNode; class PadLayerNode; class PermuteLayerNode; class PoolingLayerNode; +class PReluLayerNode; class PrintLayerNode; class PriorBoxLayerNode; class QuantizationLayerNode; diff --git a/arm_compute/graph/nodes/PReluLayerNode.h b/arm_compute/graph/nodes/PReluLayerNode.h new file mode 100644 index 0000000000..f2055c2281 --- /dev/null +++ b/arm_compute/graph/nodes/PReluLayerNode.h @@ -0,0 +1,48 @@ +/* + * 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_PRELU_LAYER_NODE_H +#define ARM_COMPUTE_GRAPH_PRELU_LAYER_NODE_H + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** PRelu Layer node */ +class PReluLayerNode final : public INode +{ +public: + /** Default Constructor */ + PReluLayerNode(); + + // Inherited overridden methods: + NodeType type() const override; + bool forward_descriptors() override; + TensorDescriptor configure_output(size_t idx) const override; + void accept(INodeVisitor &v) override; +}; +} // namespace graph +} // namespace arm_compute +#endif /* ARM_COMPUTE_GRAPH_PRELU_LAYER_NODE_H */ diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 14f919d057..6592b2b21e 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -581,6 +581,20 @@ NodeID GraphBuilder::add_permute_node(Graph &g, NodeParams params, NodeIdxPair i return create_simple_single_input_output_node(g, params, input, perm, layout); } +NodeID GraphBuilder::add_prelu_node(Graph &g, NodeParams params, NodeIdxPair input, NodeIdxPair alpha) +{ + check_nodeidx_pair(input, g); + check_nodeidx_pair(alpha, g); + + NodeID prelu_nid = g.add_node(); + g.add_connection(input.node_id, input.index, prelu_nid, 0); + g.add_connection(alpha.node_id, alpha.index, prelu_nid, 1); + + set_node_params(g, prelu_nid, params); + + return prelu_nid; +} + NodeID GraphBuilder::add_pooling_node(Graph &g, NodeParams params, NodeIdxPair input, PoolingLayerInfo pool_info) { return create_simple_single_input_output_node(g, params, input, pool_info); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index c841126b1c..e6684f676d 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -272,6 +272,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_permute_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: return detail::create_pooling_layer(*polymorphic_downcast(node)); + case NodeType::PReluLayer: + return detail::create_prelu_layer(*polymorphic_downcast(node)); case NodeType::PrintLayer: return detail::create_print_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 8ca58bc6e8..ddb8e3d1ac 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -73,6 +73,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_pad_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return detail::validate_permute_layer(*polymorphic_downcast(node)); + case NodeType::PReluLayer: + return detail::validate_prelu_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: return detail::validate_priorbox_layer(*polymorphic_downcast(node)); case NodeType::QuantizationLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index 3597139003..ddb4ccf391 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -231,6 +231,8 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & return detail::create_permute_layer(*polymorphic_downcast(node)); case NodeType::PoolingLayer: return detail::create_pooling_layer(*polymorphic_downcast(node)); + case NodeType::PReluLayer: + return detail::create_prelu_layer(*polymorphic_downcast(node)); case NodeType::PrintLayer: return detail::create_print_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index ec8c0e5222..0a3107292b 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -73,6 +73,8 @@ Status NENodeValidator::validate(INode *node) return detail::validate_pad_layer(*polymorphic_downcast(node)); case NodeType::PermuteLayer: return detail::validate_permute_layer(*polymorphic_downcast(node)); + case NodeType::PReluLayer: + return detail::validate_prelu_layer(*polymorphic_downcast(node)); case NodeType::PriorBoxLayer: return detail::validate_priorbox_layer(*polymorphic_downcast(node)); case NodeType::QuantizationLayer: diff --git a/src/graph/nodes/PReluLayerNode.cpp b/src/graph/nodes/PReluLayerNode.cpp new file mode 100644 index 0000000000..9310aaf727 --- /dev/null +++ b/src/graph/nodes/PReluLayerNode.cpp @@ -0,0 +1,71 @@ +/* + * 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/PReluLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +namespace arm_compute +{ +namespace graph +{ +PReluLayerNode::PReluLayerNode() +{ + _input_edges.resize(2, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +bool PReluLayerNode::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 PReluLayerNode::configure_output(size_t idx) const +{ + ARM_COMPUTE_UNUSED(idx); + + const Tensor *src = input(0); + ARM_COMPUTE_ERROR_ON(src == nullptr); + + return src->desc(); +} + +NodeType PReluLayerNode::type() const +{ + return NodeType::PReluLayer; +} + +void PReluLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1