diff options
author | Michalis Spyrou <michalis.spyrou@arm.com> | 2018-09-13 11:39:28 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
commit | 96f6769de9d9ebe3e631b81aac9a82934a79b0c4 (patch) | |
tree | eaf3efea9eb89b05d1aecfc7d64b3cf89b3cdc57 /arm_compute/graph/backends | |
parent | 8e1f3c0685a4a0413c6d57a3254b5d59949ec255 (diff) | |
download | ComputeLibrary-96f6769de9d9ebe3e631b81aac9a82934a79b0c4.tar.gz |
COMPMID-1582 Add YOLOLayer to graph API
Change-Id: I8eb7cf220f038b0ac70cb3df1f399a3b66bbca1b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148245
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: bsgcomp <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/graph/backends')
-rw-r--r-- | arm_compute/graph/backends/FunctionHelpers.h | 40 | ||||
-rw-r--r-- | arm_compute/graph/backends/ValidateHelpers.h | 23 |
2 files changed, 63 insertions, 0 deletions
diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h index 88d6ce15b9..9ef7226ceb 100644 --- a/arm_compute/graph/backends/FunctionHelpers.h +++ b/arm_compute/graph/backends/FunctionHelpers.h @@ -876,6 +876,46 @@ std::unique_ptr<IFunction> create_softmax_layer(SoftmaxLayerNode &node, GraphCon return std::move(func); } +/** Create a backend YOLO layer function + * + * @tparam YoloLayerFunction Backend YOLO function + * @tparam TargetInfo Target-specific information + * + * @param[in] node Node to create the backend function for + * @param[in] ctx Graph context + * + * @return Backend YOLO layer function + */ +template <typename YOLOlayerFunction, typename TargetInfo> +std::unique_ptr<IFunction> create_yolo_layer(YOLOLayerNode &node, GraphContext &ctx) +{ + validate_node<TargetInfo>(node, 1 /* expected inputs */, 1 /* expected outputs */); + + // Extract IO and info + typename TargetInfo::TensorType *input = get_backing_tensor<TargetInfo>(node.input(0)); + typename TargetInfo::TensorType *output = get_backing_tensor<TargetInfo>(node.output(0)); + const ActivationLayerInfo act_info = node.activation_info(); + const int32_t num_classes = node.num_classes(); + ARM_COMPUTE_ERROR_ON(num_classes <= 0); + ARM_COMPUTE_ERROR_ON(input == nullptr); + ARM_COMPUTE_ERROR_ON(output == nullptr); + + // Create and configure function + auto func = support::cpp14::make_unique<YOLOlayerFunction>(); + func->configure(input, output, act_info, num_classes); + + // Log info + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << node.type() + << " Target " << TargetInfo::TargetType + << " Data Type: " << input->info()->data_type() + << " Input shape: " << input->info()->tensor_shape() + << " Output shape: " << output->info()->tensor_shape() + << " Activation function: " << act_info.activation() + << " Num classes: " << num_classes + << std::endl); + + return std::move(func); +} } // namespace detail } // namespace backends } // namespace graph diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h index 1de3aa9a31..eb3762571d 100644 --- a/arm_compute/graph/backends/ValidateHelpers.h +++ b/arm_compute/graph/backends/ValidateHelpers.h @@ -248,6 +248,29 @@ Status validate_reorg_layer(ReorgLayerNode &node) // Validate function return ReorgLayer::validate(input, output, node.stride()); } + +/** Validates a YOLO layer node + * + * @tparam YOLOLayer YOLO layer type + * + * @param[in] node Node to validate + * + * @return Status + */ +template <typename YOLOLayer> +Status validate_yolo_layer(YOLOLayerNode &node) +{ + ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating YOLOLayer node with ID : " << node.id() << " and Name: " << node.name() << std::endl); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_inputs() != 1); + ARM_COMPUTE_RETURN_ERROR_ON(node.num_outputs() != 1); + + // Extract input and output + arm_compute::ITensorInfo *input = detail::get_backing_tensor_info(node.input(0)); + arm_compute::ITensorInfo *output = get_backing_tensor_info(node.output(0)); + + // Validate function + return YOLOLayer::validate(input, output, node.activation_info(), node.num_classes()); +} } // namespace detail } // namespace backends } // namespace graph |