diff options
author | Manuel Bottini <manuel.bottini@arm.com> | 2019-02-13 16:34:56 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-02-18 13:41:28 +0000 |
commit | 5209be567a0a7df4d205d3dc2b971b8f03964593 (patch) | |
tree | d46aa0667db72c32a2066a4d1d893db225c2b6db /arm_compute/graph/backends | |
parent | 453ef521926e47d5a65b576da48288a6aa27e813 (diff) | |
download | ComputeLibrary-5209be567a0a7df4d205d3dc2b971b8f03964593.tar.gz |
COMPMID-1999: Add support for GenerateProposals operator in CL
Change-Id: Ie08a6874347085f96b00f25bdb605eee7d683c25
Signed-off-by: giuros01 <giuseppe.rossini@arm.com>
Reviewed-on: https://review.mlplatform.org/719
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Diffstat (limited to 'arm_compute/graph/backends')
-rw-r--r-- | arm_compute/graph/backends/FunctionHelpers.h | 49 | ||||
-rw-r--r-- | arm_compute/graph/backends/ValidateHelpers.h | 27 |
2 files changed, 76 insertions, 0 deletions
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 548afd27c5..7242bc6ede 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -688,6 +688,55 @@ std::unique_ptr<IFunction> 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 <typename GenerateProposalsLayerFunction, typename TargetInfo> +std::unique_ptr<IFunction> create_generate_proposals_layer(GenerateProposalsLayerNode &node, GraphContext &ctx) +{ + validate_node<TargetInfo>(node, 3 /* expected inputs */, 3 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *scores = get_backing_tensor<TargetInfo>(node.input(0)); + typename TargetInfo::TensorType *deltas = get_backing_tensor<TargetInfo>(node.input(1)); + typename TargetInfo::TensorType *anchors = get_backing_tensor<TargetInfo>(node.input(2)); + typename TargetInfo::TensorType *proposals = get_backing_tensor<TargetInfo>(node.output(0)); + typename TargetInfo::TensorType *scores_out = get_backing_tensor<TargetInfo>(node.output(1)); + typename TargetInfo::TensorType *num_valid_proposals = get_backing_tensor<TargetInfo>(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<GenerateProposalsLayerFunction>(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 1b06f31bed..8942be2da8 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -228,6 +228,33 @@ Status validate_detection_output_layer(DetectionOutputLayerNode &node) return DetectionOutputLayer::validate(input0, input1, input2, output, detect_info); } +/** Validates a Generate Proposals layer node + * + * @tparam GenerateProposalsLayer Generate Proposals layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template <typename GenerateProposalsLayer> +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 |