From 23e2479c6e29674a1186465eb6e38b73760c8a91 Mon Sep 17 00:00:00 2001
From: Gian Marco Iodice <gianmarco.iodice@arm.com>
Date: Fri, 7 Sep 2018 15:32:14 +0100
Subject: COMPMID-1556 - Add ReorgLayer to graph API

Change-Id: I50c13b5808f3cceec36b92e7afc027f47ebbdea4
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/147369
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
---
 arm_compute/graph/backends/FunctionHelpers.h | 35 ++++++++++++++++++++++++++++
 arm_compute/graph/backends/ValidateHelpers.h | 23 ++++++++++++++++++
 2 files changed, 58 insertions(+)

(limited to 'arm_compute/graph/backends')

diff --git a/arm_compute/graph/backends/FunctionHelpers.h b/arm_compute/graph/backends/FunctionHelpers.h
index bf458ae33f..b1446ea493 100644
--- a/arm_compute/graph/backends/FunctionHelpers.h
+++ b/arm_compute/graph/backends/FunctionHelpers.h
@@ -695,6 +695,41 @@ std::unique_ptr<IFunction> create_pooling_layer(PoolingLayerNode &node)
     return std::move(func);
 }
 
+/** Create a backend reorg layer function
+ *
+ * @tparam ReorgLayerFunction Backend reshape function
+ * @tparam TargetInfo         Target-specific information
+ *
+ * @param[in] node Node to create the backend function for
+ *
+ * @return Backend reshape layer function
+ */
+template <typename ReorgLayerFunction, typename TargetInfo>
+std::unique_ptr<IFunction> create_reorg_layer(ReorgLayerNode &node)
+{
+    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));
+    ARM_COMPUTE_ERROR_ON(input == nullptr);
+    ARM_COMPUTE_ERROR_ON(output == nullptr);
+
+    // Create and configure function
+    auto func = support::cpp14::make_unique<ReorgLayerFunction>();
+    func->configure(input, output, node.stride());
+
+    // 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()
+                               << std::endl);
+
+    return std::move(func);
+}
+
 /** Create a backend reshape layer function
  *
  * @tparam ReshapeLayerFunction Backend reshape function
diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index 3064db20c3..e8b8af154f 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -201,6 +201,29 @@ Status validate_permute_layer(PermuteLayerNode &node)
 
     return PermuteLayer::validate(input, output, perm);
 }
+
+/** Validates a Reorg layer node
+ *
+ * @tparam ReorgLayer Reorg layer type
+ *
+ * @param[in] node Node to validate
+ *
+ * @return Status
+ */
+template <typename ReorgLayer>
+Status validate_reorg_layer(ReorgLayerNode &node)
+{
+    ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating ReorgLayer 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 ReorgLayer::validate(input, output, node.stride());
+}
 } // namespace detail
 } // namespace backends
 } // namespace graph
-- 
cgit v1.2.1