From 47e6fede687a301137cef25ff729e68d099d4520 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 13 Nov 2018 12:04:25 +0000 Subject: COMPMID-1639: Add GenerateProposals to the graph API Change-Id: Icf813a0a87d4a07e180eafdb5fa916b2ea4028d2 --- arm_compute/graph/GraphBuilder.h | 13 +++++ arm_compute/graph/TypePrinter.h | 3 ++ arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 49 ++++++++++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 27 ++++++++++ arm_compute/graph/frontend/Layers.h | 44 ++++++++++++++++ .../graph/nodes/GenerateProposalsLayerNode.h | 60 ++++++++++++++++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + 9 files changed, 199 insertions(+) create mode 100644 arm_compute/graph/nodes/GenerateProposalsLayerNode.h (limited to 'arm_compute/graph') diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 611e69dbb3..c501006ec6 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -240,6 +240,19 @@ public: const FullyConnectedLayerInfo fc_info = FullyConnectedLayerInfo(), const QuantizationInfo weights_quant_info = QuantizationInfo(), const QuantizationInfo out_quant_info = QuantizationInfo()); + /** Adds a generate proposals layer node to the graph + * + * @param[in] g Graph to add the layer to + * @param[in] params Common node parameters + * @param[in] scores Input scores to the generate proposals layer node as a NodeID-Index pair + * @param[in] deltas Input deltas to the generate proposals layer node as a NodeID-Index pair + * @param[in] anchors Input anchors to the generate proposals layer node as a NodeID-Index pair + * @param[in] info Generate proposals operation information + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_generate_proposals_node(Graph &g, NodeParams params, NodeIdxPair scores, NodeIdxPair deltas, + NodeIdxPair anchors, GenerateProposalsInfo info); /** Adds a normalization 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 697ee94331..b7dc2bb284 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -95,6 +95,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::FullyConnectedLayer: os << "FullyConnectedLayer"; break; + case NodeType::GenerateProposalsLayer: + os << "GenerateProposalsLayer"; + break; case NodeType::NormalizationLayer: os << "NormalizationLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index b9589b753c..ceee776aaa 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -135,6 +135,7 @@ enum class NodeType EltwiseLayer, FlattenLayer, FullyConnectedLayer, + GenerateProposalsLayer, NormalizationLayer, NormalizePlanarYUVLayer, PadLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index d235fe9f6f..082d43afdb 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -622,6 +622,55 @@ std::unique_ptr create_fully_connected_layer(FullyConnectedLayerNode return std::move(func); } +/** Create a backend generate proposals layer function + * + * @tparam GenerateProposalsLayerFunction Backend generate proposals function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * @param[in] ctx Graph context + * + * @return Backend generate proposals layer function + */ +template +std::unique_ptr create_generate_proposals_layer(GenerateProposalsLayerNode &node, GraphContext &ctx) +{ + validate_node(node, 3 /* expected inputs */, 3 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *scores = get_backing_tensor(node.input(0)); + typename TargetInfo::TensorType *deltas = get_backing_tensor(node.input(1)); + typename TargetInfo::TensorType *anchors = get_backing_tensor(node.input(2)); + typename TargetInfo::TensorType *proposals = get_backing_tensor(node.output(0)); + typename TargetInfo::TensorType *scores_out = get_backing_tensor(node.output(1)); + typename TargetInfo::TensorType *num_valid_proposals = get_backing_tensor(node.output(2)); + const GenerateProposalsInfo info = node.info(); + + ARM_COMPUTE_ERROR_ON(scores == nullptr); + ARM_COMPUTE_ERROR_ON(deltas == nullptr); + ARM_COMPUTE_ERROR_ON(anchors == nullptr); + ARM_COMPUTE_ERROR_ON(proposals == nullptr); + ARM_COMPUTE_ERROR_ON(scores_out == nullptr); + + // Create and configure function + auto func = support::cpp14::make_unique(get_memory_manager(ctx, TargetInfo::TargetType)); + func->configure(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info); + + // Log info + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type() + << " Target " << TargetInfo::TargetType + << " Data Type: " << scores->info()->data_type() + << " Scores shape: " << scores->info()->tensor_shape() + << " Deltas shape: " << deltas->info()->tensor_shape() + << " Anchors shape: " << anchors->info()->tensor_shape() + << " Proposals shape: " << proposals->info()->tensor_shape() + << " Num valid proposals shape: " << num_valid_proposals->info()->tensor_shape() + << " Scores Out shape: " << scores_out->info()->tensor_shape() + << std::endl); + + return std::move(func); +} + /** Create a backend normalization layer function * * @tparam NormalizationLayerFunction Backend normalization function diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 999ce190ab..169c795fb4 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -203,6 +203,33 @@ Status validate_depthwise_convolution_layer(DepthwiseConvolutionLayerNode &node) return status; } +/** Validates a Generate Proposals layer node + * + * @tparam GenerateProposalsLayer Generate Proposals layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_generate_proposals_layer(GenerateProposalsLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating GenerateProposalsLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 3); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 3); + + // Extract IO and info + arm_compute::ITensorInfo *scores = detail::get_backing_tensor_info(node.input(0)); + arm_compute::ITensorInfo *deltas = detail::get_backing_tensor_info(node.input(1)); + arm_compute::ITensorInfo *anchors = detail::get_backing_tensor_info(node.input(2)); + arm_compute::ITensorInfo *proposals = get_backing_tensor_info(node.output(0)); + arm_compute::ITensorInfo *scores_out = get_backing_tensor_info(node.output(1)); + arm_compute::ITensorInfo *num_valid_proposals = get_backing_tensor_info(node.output(2)); + const GenerateProposalsInfo info = node.info(); + + return GenerateProposalsLayer::validate(scores, deltas, anchors, proposals, scores_out, num_valid_proposals, info); +} + /** Validates a NormalizePlanarYUV layer node * * @tparam NormalizePlanarYUVLayer layer type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index fa0656dcdc..56dcd88077 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -531,6 +531,12 @@ public: { } + /** Create layer and add to the given stream. + * + * @param[in] s Stream to add layer to. + * + * @return ID of the created node. + */ NodeID create_layer(IStream &s) override { NodeParams common_params = { name(), s.hints().target_hint }; @@ -549,6 +555,44 @@ private: const QuantizationInfo _out_quant_info; }; +/** Generate Proposals Layer */ +class GenerateProposalsLayer final : public ILayer +{ +public: + /** Construct a generate proposals layer. + * + * @param[in] ss_scores Graph sub-stream for the scores. + * @param[in] ss_deltas Graph sub-stream for the deltas. + * @param[in] ss_anchors Graph sub-stream for the anchors. + * @param[in] info Generate Proposals operation information. + */ + GenerateProposalsLayer(SubStream &&ss_scores, SubStream &&ss_deltas, SubStream &&ss_anchors, GenerateProposalsInfo info) + : _ss_scores(std::move(ss_scores)), _ss_deltas(std::move(ss_deltas)), _ss_anchors(std::move(ss_anchors)), _info(info) + { + } + + /** Create layer and add to the given stream. + * + * @param[in] s Stream to add layer to. + * + * @return ID of the created node. + */ + NodeID create_layer(IStream &s) override + { + NodeParams common_params = { name(), s.hints().target_hint }; + NodeIdxPair scores = { _ss_scores.tail_node(), 0 }; + NodeIdxPair deltas = { _ss_deltas.tail_node(), 0 }; + NodeIdxPair anchors = { _ss_anchors.tail_node(), 0 }; + return GraphBuilder::add_generate_proposals_node(s.graph(), common_params, scores, deltas, anchors, _info); + } + +private: + SubStream _ss_scores; + SubStream _ss_deltas; + SubStream _ss_anchors; + GenerateProposalsInfo _info; +}; + /** Normalization Layer */ class NormalizationLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/GenerateProposalsLayerNode.h b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h new file mode 100644 index 0000000000..09fbb3ee15 --- /dev/null +++ b/arm_compute/graph/nodes/GenerateProposalsLayerNode.h @@ -0,0 +1,60 @@ +/* + * 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_GENERATE_PROPOSALS_NODE_H__ +#define __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__ + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** Generate Proposals Layer node */ +class GenerateProposalsLayerNode final : public INode +{ +public: + /** Constructor + * + * @param[in] info Generate proposals operation information. + */ + GenerateProposalsLayerNode(GenerateProposalsInfo &info); + /** GenerateProposalsInfo accessor + * + * @return GenerateProposalsInfo + */ + const GenerateProposalsInfo &info() 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: + GenerateProposalsInfo _info; +}; +} // namespace graph +} // namespace arm_compute +#endif /* __ARM_COMPUTE_GENERATE_PROPOSALS_NODE_H__ */ diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 6acebdc231..afd4e2cf67 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -37,6 +37,7 @@ #include "arm_compute/graph/nodes/EltwiseLayerNode.h" #include "arm_compute/graph/nodes/FlattenLayerNode.h" #include "arm_compute/graph/nodes/FullyConnectedLayerNode.h" +#include "arm_compute/graph/nodes/GenerateProposalsLayerNode.h" #include "arm_compute/graph/nodes/InputNode.h" #include "arm_compute/graph/nodes/NormalizationLayerNode.h" #include "arm_compute/graph/nodes/NormalizePlanarYUVLayerNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index e7045579d3..929a4021ef 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -43,6 +43,7 @@ class DummyNode; class EltwiseLayerNode; class FlattenLayerNode; class FullyConnectedLayerNode; +class GenerateProposalsLayerNode; class InputNode; class NormalizationLayerNode; class NormalizePlanarYUVLayerNode; -- cgit v1.2.1