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 --- 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 +++++++++++++++++++++++ 6 files changed, 103 insertions(+) create mode 100644 src/graph/nodes/BoundingBoxTransformLayerNode.cpp (limited to 'src/graph') 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