commit 0ae5de9124a0094e656244ad2f807c084966fc04
author Isabella Gottardi <isabella.gottardi@arm.com> Thu Mar 14 10:32:11 2019 +0000
committer Isabella Gottardi <isabella.gottardi@arm.com> Wed Mar 20 11:23:43 2019 +0000
tree ab698ad9c43f95dda13f78cf76b753105cf69388
parent b0c5037d94ba7073ccabb0ebaff54db320f184c4

COMPMID-1995: Prepare Graph to support different input/output quantization info

- Added support for different input/output qinfo in ActivationLayer and DepthwiseConv
- Added support for different input/output qinfo in ConcatenateLayer introducing ConcatDescriptor
- Added reshape validate
- Allow OutputLayer to return a specific connection index from the input
- Not run Inplace and Depth mutator when input/output quantization info are different

Change-Id: I03f5e416fc43ddd284e1501887202a3145f76d8a
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
Reviewed-on: https://review.mlplatform.org/c/852
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

arm_compute/graph/backends/ValidateHelpers.h

diff --git a/arm_compute/graph/backends/ValidateHelpers.h b/arm_compute/graph/backends/ValidateHelpers.h
index 8942be2..dbf8f35 100644
--- a/arm_compute/graph/backends/ValidateHelpers.h
+++ b/arm_compute/graph/backends/ValidateHelpers.h
@@ -203,6 +203,7 @@
 
     return status;
 }
+
 /** Validates a detection output layer node
  *
  * @tparam DetectionOutputLayer DetectionOutput layer type
@@ -372,6 +373,29 @@
     return ReorgLayer::validate(input, output, node.stride());
 }
 
+/** Validates a Reshape layer node
+ *
+ * @tparam ReshapeLayer Reshape layer type
+ *
+ * @param[in] node Node to validate
+ *
+ * @return Status
+ */
+template <typename ReshapeLayer>
+Status validate_reshape_layer(ReshapeLayerNode &node)
+{
+    ARM_COMPUTE_LOG_GRAPH_VERBOSE("Validating ReshapeLayer 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 = detail::get_backing_tensor_info(node.output(0));
+
+    // Validate function
+    return ReshapeLayer::validate(input, output);
+}
+
 /** Validates a ROI Align layer node
  *
  * @tparam ROIAlignLayer ROIAlign layer type