From 32521430ad67172d372721979e8a32b7d4317620 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Thu, 15 Nov 2018 14:43:10 +0000 Subject: COMPMID-1750: Add PriorBox operator to graph API. Change-Id: I5d2ed5dcc342abff8124762f7bdee587cdf20032 --- src/graph/GraphBuilder.cpp | 15 ++++ src/graph/backends/CL/CLFunctionsFactory.cpp | 2 + src/graph/backends/CL/CLNodeValidator.cpp | 2 + src/graph/backends/GLES/GCFunctionsFactory.cpp | 21 ++++-- src/graph/backends/GLES/GCNodeValidator.cpp | 2 + src/graph/backends/NEON/NEFunctionFactory.cpp | 10 ++- src/graph/backends/NEON/NENodeValidator.cpp | 2 + src/graph/detail/ExecutionHelpers.cpp | 3 +- src/graph/nodes/FlattenLayerNode.cpp | 2 +- src/graph/nodes/PriorBoxLayerNode.cpp | 95 ++++++++++++++++++++++++++ 10 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 src/graph/nodes/PriorBoxLayerNode.cpp (limited to 'src/graph') diff --git a/src/graph/GraphBuilder.cpp b/src/graph/GraphBuilder.cpp index b4c58780bd..b2ca28da57 100644 --- a/src/graph/GraphBuilder.cpp +++ b/src/graph/GraphBuilder.cpp @@ -494,6 +494,21 @@ NodeID GraphBuilder::add_pooling_node(Graph &g, NodeParams params, NodeIdxPair i return create_simple_single_input_output_node(g, params, input, pool_info); } +NodeID GraphBuilder::add_priorbox_node(Graph &g, NodeParams params, NodeIdxPair input0, NodeIdxPair input1, PriorBoxLayerInfo prior_info) +{ + CHECK_NODEIDX_PAIR(input0, g); + CHECK_NODEIDX_PAIR(input1, g); + + // Create priorbox node and connect + NodeID prior_nid = g.add_node(prior_info); + g.add_connection(input0.node_id, input0.index, prior_nid, 0); + g.add_connection(input1.node_id, input1.index, prior_nid, 1); + + set_node_params(g, prior_nid, params); + + return prior_nid; +} + 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 f63aba9ec5..c37a137cf7 100644 --- a/src/graph/backends/CL/CLFunctionsFactory.cpp +++ b/src/graph/backends/CL/CLFunctionsFactory.cpp @@ -113,6 +113,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::PriorBoxLayer: + return detail::create_priorbox_layer(*polymorphic_downcast(node)); 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 1ea3517467..a070973fd4 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -67,6 +67,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::PriorBoxLayer: + return detail::validate_priorbox_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::ROIAlignLayer: diff --git a/src/graph/backends/GLES/GCFunctionsFactory.cpp b/src/graph/backends/GLES/GCFunctionsFactory.cpp index 7df659e7b3..2ca453ebde 100644 --- a/src/graph/backends/GLES/GCFunctionsFactory.cpp +++ b/src/graph/backends/GLES/GCFunctionsFactory.cpp @@ -94,7 +94,8 @@ std::unique_ptr create_concatenate_layerconfigure(inputs, output); // Log info - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type() + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " + << node.name() << " Target " << GCTargetInfo::TargetType << " Data Type: " << output->info()->data_type() << " Shape: " << output->info()->tensor_shape() @@ -143,7 +144,9 @@ std::unique_ptr create_convolution_layerinfo()->data_type() << " Input QuantInfo: " << input->info()->quantization_info() << " Weights QuantInfo: " << weights->info()->quantization_info() @@ -191,7 +194,9 @@ std::unique_ptr create_depthwise_convolution_layerinfo()->data_type() << " Input QuantInfo: " << input->info()->quantization_info() @@ -246,11 +251,13 @@ std::unique_ptr create_eltwise_layerinfo()->data_type() - << " Shape : " << input1->info()->tensor_shape() + << " Shape: " << input1->info()->tensor_shape() << std::endl); return func; diff --git a/src/graph/backends/GLES/GCNodeValidator.cpp b/src/graph/backends/GLES/GCNodeValidator.cpp index 9cf39c6675..fe69c7a9ee 100644 --- a/src/graph/backends/GLES/GCNodeValidator.cpp +++ b/src/graph/backends/GLES/GCNodeValidator.cpp @@ -121,6 +121,8 @@ Status GCNodeValidator::validate(INode *node) return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PadLayer"); case NodeType::PermuteLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PermuteLayer"); + case NodeType::PriorBoxLayer: + return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PriorBoxLayer"); case NodeType::ReorgLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ReorgLayer"); case NodeType::ReshapeLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index f03cead2b4..ca8d485f8b 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -163,8 +163,10 @@ std::unique_ptr create_normalization_layerconfigure(input, output, norm_info); // Log info - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type() - << " Target " << NETargetInfo::TargetType + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " + << node.name() + << " Type: " << node.type() + << " Target: " << NETargetInfo::TargetType << " Data Type: " << input->info()->data_type() << " Input shape: " << input->info()->tensor_shape() << " Output shape: " << output->info()->tensor_shape() @@ -211,6 +213,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::PriorBoxLayer: + return detail::create_priorbox_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::create_reorg_layer(*polymorphic_downcast(node)); case NodeType::ReshapeLayer: @@ -229,4 +233,4 @@ std::unique_ptr NEFunctionFactory::create(INode *node, GraphContext & } } // namespace backends } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index f2131586b2..a2abc8330c 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -67,6 +67,8 @@ Status NENodeValidator::validate(INode *node) return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : PadLayer"); case NodeType::PermuteLayer: return detail::validate_permute_layer(*polymorphic_downcast(node)); + case NodeType::PriorBoxLayer: + return detail::validate_priorbox_layer(*polymorphic_downcast(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer(*polymorphic_downcast(node)); case NodeType::ROIAlignLayer: diff --git a/src/graph/detail/ExecutionHelpers.cpp b/src/graph/detail/ExecutionHelpers.cpp index f479963280..f2c381b7df 100644 --- a/src/graph/detail/ExecutionHelpers.cpp +++ b/src/graph/detail/ExecutionHelpers.cpp @@ -254,7 +254,8 @@ bool call_all_output_node_accessors(ExecutionWorkload &workload) bool is_valid = true; std::for_each(std::begin(workload.outputs), std::end(workload.outputs), [&](Tensor * output_tensor) { - is_valid = is_valid && (output_tensor != nullptr) && output_tensor->call_accessor(); + bool valid_output = (output_tensor != nullptr) && output_tensor->call_accessor(); + is_valid = is_valid && valid_output; }); return is_valid; diff --git a/src/graph/nodes/FlattenLayerNode.cpp b/src/graph/nodes/FlattenLayerNode.cpp index 78b45dc305..baae555247 100644 --- a/src/graph/nodes/FlattenLayerNode.cpp +++ b/src/graph/nodes/FlattenLayerNode.cpp @@ -57,7 +57,7 @@ TensorDescriptor FlattenLayerNode::configure_output(size_t idx) const ARM_COMPUTE_ERROR_ON(src == nullptr); TensorDescriptor output_desc = src->desc(); - output_desc.shape.collapse(src->desc().shape.num_dimensions()); + output_desc.shape.collapse(3); return output_desc; } diff --git a/src/graph/nodes/PriorBoxLayerNode.cpp b/src/graph/nodes/PriorBoxLayerNode.cpp new file mode 100644 index 0000000000..edb1fba255 --- /dev/null +++ b/src/graph/nodes/PriorBoxLayerNode.cpp @@ -0,0 +1,95 @@ +/* + * 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/PriorBoxLayerNode.h" + +#include "arm_compute/core/Utils.h" +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/INodeVisitor.h" +#include "arm_compute/graph/Utils.h" + +namespace arm_compute +{ +namespace graph +{ +PriorBoxLayerNode::PriorBoxLayerNode(PriorBoxLayerInfo prior_info) + : _info(std::move(prior_info)) +{ + _input_edges.resize(2, EmptyEdgeID); + _outputs.resize(1, NullTensorID); +} + +PriorBoxLayerInfo PriorBoxLayerNode::priorbox_info() const +{ + return _info; +} + +TensorDescriptor PriorBoxLayerNode::compute_output_descriptor(const TensorDescriptor &input_descriptor, + const PriorBoxLayerInfo &info) +{ + const unsigned int layer_width = get_dimension_size(input_descriptor, DataLayoutDimension::WIDTH); + const unsigned int layer_height = get_dimension_size(input_descriptor, DataLayoutDimension::HEIGHT); + const unsigned int num_priors = info.aspect_ratios().size() * info.min_sizes().size() + info.max_sizes().size(); + + TensorDescriptor output_descriptor = input_descriptor; + output_descriptor.shape.set(0, layer_width * layer_height * num_priors * 4); + output_descriptor.shape.set(1, 2); + output_descriptor.shape.set(2, 1); + + return output_descriptor; +} + +bool PriorBoxLayerNode::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 PriorBoxLayerNode::configure_output(size_t idx) const +{ + ARM_COMPUTE_UNUSED(idx); + ARM_COMPUTE_ERROR_ON(idx >= _outputs.size()); + + const Tensor *input0 = input(0); + ARM_COMPUTE_ERROR_ON(input0 == nullptr); + + return compute_output_descriptor(input0->desc(), _info); +} + +NodeType PriorBoxLayerNode::type() const +{ + return NodeType::PriorBoxLayer; +} + +void PriorBoxLayerNode::accept(INodeVisitor &v) +{ + v.visit(*this); +} +} // namespace graph +} // namespace arm_compute -- cgit v1.2.1