diff options
author | Giuseppe Rossini <giuseppe.rossini@arm.com> | 2019-02-15 10:24:47 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-02-15 14:10:55 +0000 |
commit | bb365de1e14144f239f03de00db9b41f61bf7373 (patch) | |
tree | 3ff92f5c65384be953cedad2fc22854269e87f23 /arm_compute/graph/backends | |
parent | 5576315671cb357bcfc2d794e7f172ab4c633606 (diff) | |
download | ComputeLibrary-bb365de1e14144f239f03de00db9b41f61bf7373.tar.gz |
Revert "COMPMID-1329: Add support for GenerateProposals operator in CL"
This reverts commit cd96a26f67bfbb9b0efe6e0e2b229d0b46b4e3e6.
Change-Id: I1d46f37095c94968ad4f3b781269adaa03e2e410
Signed-off-by: giuros01 <giuseppe.rossini@arm.com>
Reviewed-on: https://review.mlplatform.org/706
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'arm_compute/graph/backends')
-rw-r--r-- | arm_compute/graph/backends/FunctionHelpers.h | 51 | ||||
-rw-r--r-- | arm_compute/graph/backends/ValidateHelpers.h | 29 |
2 files changed, 2 insertions, 78 deletions
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 96adffee46..548afd27c5 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -688,55 +688,6 @@ 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 f1e53613ab..1b06f31bed 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -228,33 +228,6 @@ 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 |