From d2048ce58a88853cee6cdd67fe0d6f09c3e212b0 Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Tue, 23 Oct 2018 17:00:42 +0100 Subject: COMPMID-1638 - Add BBoxTransform to the graph API Change-Id: I67cbbce59d61d907fc4dc4c3997e96b347dfe895 --- arm_compute/graph/GraphBuilder.h | 11 +++ arm_compute/graph/TypePrinter.h | 3 + arm_compute/graph/Types.h | 1 + arm_compute/graph/backends/FunctionHelpers.h | 36 ++++++++++ arm_compute/graph/backends/ValidateHelpers.h | 24 +++++++ arm_compute/graph/frontend/Layers.h | 35 ++++++++++ .../graph/nodes/BoundingBoxTransformLayerNode.h | 60 ++++++++++++++++ arm_compute/graph/nodes/Nodes.h | 1 + arm_compute/graph/nodes/NodesFwd.h | 1 + src/graph/GraphBuilder.cpp | 14 ++++ 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/NENodeValidator.cpp | 2 + src/graph/nodes/BoundingBoxTransformLayerNode.cpp | 81 ++++++++++++++++++++++ 15 files changed, 275 insertions(+) create mode 100644 arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h create mode 100644 src/graph/nodes/BoundingBoxTransformLayerNode.cpp diff --git a/arm_compute/graph/GraphBuilder.h b/arm_compute/graph/GraphBuilder.h index 2170cd19b6..611e69dbb3 100644 --- a/arm_compute/graph/GraphBuilder.h +++ b/arm_compute/graph/GraphBuilder.h @@ -97,6 +97,17 @@ public: static NodeID add_batch_normalization_node(Graph &g, NodeParams params, NodeIdxPair input, float epsilon, ITensorAccessorUPtr mean_accessor = nullptr, ITensorAccessorUPtr var_accessor = nullptr, ITensorAccessorUPtr beta_accessor = nullptr, ITensorAccessorUPtr gamma_accessor = nullptr); + /** Adds a bounding box transform 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 bounding box transform layer node as a NodeID-Index pair + * @param[in] deltas Deltas input to the bounding box transform layer node as a NodeID-Index pair + * @param[in] info Bounding Box Transform information + * + * @return Node ID of the created node, EmptyNodeID in case of error + */ + static NodeID add_bounding_box_transform_node(Graph &g, NodeParams params, NodeIdxPair input, NodeIdxPair deltas, BoundingBoxTransformInfo info); /** Adds an channel shuffle 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 9cdd7b7773..697ee94331 100644 --- a/arm_compute/graph/TypePrinter.h +++ b/arm_compute/graph/TypePrinter.h @@ -68,6 +68,9 @@ inline ::std::ostream &operator<<(::std::ostream &os, const NodeType &node_type) case NodeType::BatchNormalizationLayer: os << "BatchNormalizationLayer"; break; + case NodeType::BoundingBoxTransformLayer: + os << "BoundingBoxTransformLayer"; + break; case NodeType::ChannelShuffleLayer: os << "ChannelShuffleLayer"; break; diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index a1b077a849..005b4074c6 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -132,6 +132,7 @@ enum class NodeType { ActivationLayer, BatchNormalizationLayer, + BoundingBoxTransformLayer, ChannelShuffleLayer, ConcatenateLayer, ConvolutionLayer, diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 1968ec3923..d235fe9f6f 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -159,6 +159,42 @@ std::unique_ptr create_batch_normalization_layer(BatchNormalizationLa return std::move(func); } +/** Create a backend bounding box transform layer function + * + * @tparam BoundingBoxTransformLayerFunction Backend bounding box transform function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * + * @return Backend bounding box transform layer function + */ +template +std::unique_ptr create_bounding_box_transform_layer(BoundingBoxTransformLayerNode &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 *deltas = get_backing_tensor(node.input(1)); + typename TargetInfo::TensorType *output = get_backing_tensor(node.output(0)); + const BoundingBoxTransformInfo bbox_info = node.info(); + + // Create and configure function + auto func = support::cpp14::make_unique(); + func->configure(input, output, deltas, bbox_info); + + // Log info + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type() + << " Target " << TargetInfo::TargetType + << " Data Type: " << input->info()->data_type() + << " Shape: " << input->info()->tensor_shape() + << " BoundingBox Info img W: " << bbox_info.img_width() << " " + << " BoundingBox Info img H: " << bbox_info.img_height() << " " + << std::endl); + + return std::move(func); +} + /** Create a backend channel shuffle layer function * * @tparam ChannelShuffleLayerFunction Backend channel shuffle function diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index b0395da0bc..999ce190ab 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -52,6 +52,30 @@ inline arm_compute::ITensorInfo *get_backing_tensor_info(arm_compute::graph::Ten return ((tensor == nullptr) || (tensor->handle() == nullptr)) ? nullptr : tensor->handle()->tensor().info(); } +/** Validates a Bounding Box Transform layer node + * + * @tparam BoundingBoxTransformLayer Bounding Box Transform layer function type + * + * @param[in] node Node to validate + * + * @return Status + */ +template +Status validate_bounding_box_transform_layer(BoundingBoxTransformLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating BoundingBoxTransformLayer 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 *deltas = get_backing_tensor_info(node.input(1)); + arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0)); + const BoundingBoxTransformInfo bbox_info = node.info(); + + return BoundingBoxTransformLayer::validate(input, output, deltas, bbox_info); +} + /** Validates a Channel Shuffle layer node * * @tparam ChannelShuffleLayer Channel Shuffle layer function type diff --git a/arm_compute/graph/frontend/Layers.h b/arm_compute/graph/frontend/Layers.h index d72f549cf9..fa0656dcdc 100644 --- a/arm_compute/graph/frontend/Layers.h +++ b/arm_compute/graph/frontend/Layers.h @@ -154,6 +154,41 @@ private: float _epsilon; }; +/** Bounding Box Transform Layer */ +class BoundingBoxTransformLayer final : public ILayer +{ +public: + /** Construct a bounding box transform layer. + * + * @param[in] sub_stream_input Graph sub-stream for the input + * @param[in] sub_stream_deltas Graph sub-stream for the deltas + * @param[in] info Contains BoundingBox operation information described in @ref BoundingBoxTransformInfo. + */ + BoundingBoxTransformLayer(SubStream &&sub_stream_input, SubStream &&sub_stream_deltas, BoundingBoxTransformInfo info) + : _ss_input(sub_stream_input), _ss_deltas(sub_stream_deltas), _bbox_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 input = { _ss_input.tail_node(), 0 }; + NodeIdxPair deltas = { _ss_deltas.tail_node(), 0 }; + return GraphBuilder::add_bounding_box_transform_node(s.graph(), common_params, input, deltas, _bbox_info); + } + +private: + SubStream _ss_input; + SubStream _ss_deltas; + BoundingBoxTransformInfo _bbox_info; +}; + /** Channel Shuffle Layer */ class ChannelShuffleLayer final : public ILayer { diff --git a/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h b/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h new file mode 100644 index 0000000000..8f5c8ead7c --- /dev/null +++ b/arm_compute/graph/nodes/BoundingBoxTransformLayerNode.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_BOUNDING_BOX_TRANSFORM_NODE_H__ +#define __ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H__ + +#include "arm_compute/graph/INode.h" + +namespace arm_compute +{ +namespace graph +{ +/** Bounding Box Transform Layer node */ +class BoundingBoxTransformLayerNode final : public INode +{ +public: + /** Constructor + * + * @param[in] info Contains BoundingBox operation information described in @ref BoundingBoxTransformInfo. + */ + BoundingBoxTransformLayerNode(BoundingBoxTransformInfo &info); + /** BoundingBoxTransformInfo accessor + * + * @return BoundingBoxTransformInfo + */ + const BoundingBoxTransformInfo &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: + BoundingBoxTransformInfo _bbox_info; +}; +} // namespace graph +} // namespace arm_compute +#endif /* __ARM_COMPUTE_BOUNDING_BOX_TRANSFORM_NODE_H__ */ diff --git a/arm_compute/graph/nodes/Nodes.h b/arm_compute/graph/nodes/Nodes.h index 4e2a49db9b..6acebdc231 100644 --- a/arm_compute/graph/nodes/Nodes.h +++ b/arm_compute/graph/nodes/Nodes.h @@ -26,6 +26,7 @@ #include "arm_compute/graph/nodes/ActivationLayerNode.h" #include "arm_compute/graph/nodes/BatchNormalizationLayerNode.h" +#include "arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h" #include "arm_compute/graph/nodes/ChannelShuffleLayerNode.h" #include "arm_compute/graph/nodes/ConcatenateLayerNode.h" #include "arm_compute/graph/nodes/ConstNode.h" diff --git a/arm_compute/graph/nodes/NodesFwd.h b/arm_compute/graph/nodes/NodesFwd.h index 7aed471215..e7045579d3 100644 --- a/arm_compute/graph/nodes/NodesFwd.h +++ b/arm_compute/graph/nodes/NodesFwd.h @@ -32,6 +32,7 @@ namespace graph class INode; class ActivationLayerNode; class BatchNormalizationLayerNode; +class BoundingBoxTransformLayerNode; class ChannelShuffleLayerNode; class ConcatenateLayerNode; class ConstNode; diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index 7e511502f8..1441786377 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -168,6 +168,20 @@ NodeID GraphBuilder::add_batch_normalization_node(Graph &g, NodeParams params, N return batch_norm_nid; } +NodeID GraphBuilder::add_bounding_box_transform_node(Graph &g, NodeParams params, NodeIdxPair input, NodeIdxPair deltas, BoundingBoxTransformInfo info) +{ + CHECK_NODEIDX_PAIR(input, g); + CHECK_NODEIDX_PAIR(deltas, g); + + NodeID nid = g.add_node(info); + + g.add_connection(input.node_id, input.index, nid, 0); + g.add_connection(deltas.node_id, deltas.index, nid, 1); + + set_node_params(g, nid, params); + return nid; +} + NodeID GraphBuilder::add_channel_shuffle_node(Graph &g, NodeParams params, NodeIdxPair input, unsigned int num_groups) { return create_simple_single_input_output_node(g, params, input, num_groups); diff --git a/src/graph/backends/CL/CLFunctionsFactory.cpp b/src/graph/backends/CL/CLFunctionsFactory.cpp index 43fe706b9a..ea4e89e5c1 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -83,6 +83,8 @@ std::unique_ptr CLFunctionFactory::create(INode *node, GraphContext & return detail::create_activation_layer(*polymorphic_downcast(node)); case NodeType::BatchNormalizationLayer: return detail::create_batch_normalization_layer(*polymorphic_downcast(node)); + case NodeType::BoundingBoxTransformLayer: + return detail::create_bounding_box_transform_layer(*polymorphic_downcast(node)); case NodeType::ChannelShuffleLayer: return detail::create_channel_shuffle_layer(*polymorphic_downcast(node)); case NodeType::ConvolutionLayer: diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 5f6fa0ad41..2a3121fa65 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -47,6 +47,8 @@ Status CLNodeValidator::validate(INode *node) NodeType type = node->type(); switch(type) { + case NodeType::BoundingBoxTransformLayer: + return detail::validate_bounding_box_transform_layer(*polymorphic_downcast(node)); case NodeType::ChannelShuffleLayer: return detail::validate_channel_shuffle_layer(*polymorphic_downcast(node)); case NodeType::ConvolutionLayer: diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index 1a8876a411..29f317b881 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -103,6 +103,8 @@ Status GCNodeValidator::validate(INode *node) NodeType type = node->type(); switch(type) { + case NodeType::BoundingBoxTransformLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : BoundingBoxTransformLayer"); case NodeType::ChannelShuffleLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ChannelShuffleLayer"); case NodeType::ConvolutionLayer: diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index 325b943e81..bf2225c02a 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -47,6 +47,8 @@ Status NENodeValidator::validate(INode *node) NodeType type = node->type(); switch(type) { + case NodeType::BoundingBoxTransformLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : BoundingBoxTransformLayer"); case NodeType::ChannelShuffleLayer: return detail::validate_channel_shuffle_layer(*polymorphic_downcast(node)); case NodeType::ConvolutionLayer: diff --git a/src/graph/nodes/BoundingBoxTransformLayerNode.cpp b/src/graph/nodes/BoundingBoxTransformLayerNode.cpp new file mode 100644 index 0000000000..ad261e338d --- /dev/null +++ b/src/graph/nodes/BoundingBoxTransformLayerNode.cpp @@ -0,0 +1,81 @@ +/* + * 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. + */ +#include "arm_compute/graph/nodes/BoundingBoxTransformLayerNode.h" + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" + +#include "arm_compute/core/Helpers.h" + +namespace arm_compute +{ +namespace graph +{ +BoundingBoxTransformLayerNode::BoundingBoxTransformLayerNode(BoundingBoxTransformInfo &info) + : _bbox_info(info) +{ + _input_edges.resize(2, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +const BoundingBoxTransformInfo &BoundingBoxTransformLayerNode::info() const +{ + return _bbox_info; +} + +bool BoundingBoxTransformLayerNode::forward_descriptors() +{ + if((input_id(0) != NullTensorID) && (input_id(1) != 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 BoundingBoxTransformLayerNode::configure_output(size_t idx) const +{ + ARM_COMPUTE_UNUSED(idx); + ARM_COMPUTE_ERROR_ON(idx >= _outputs.size()); + + const Tensor *deltas = input(1); + ARM_COMPUTE_ERROR_ON(deltas == nullptr); + + TensorDescriptor output_desc = deltas->desc(); + return output_desc; +} + +NodeType BoundingBoxTransformLayerNode::type() const +{ + return NodeType::BoundingBoxTransformLayer; +} + +void BoundingBoxTransformLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1