From 0ae5de9124a0094e656244ad2f807c084966fc04 Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Thu, 14 Mar 2019 10:32:11 +0000 Subject: 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 Reviewed-on: https://review.mlplatform.org/c/852 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Reviewed-by: Georgios Pinitas --- src/graph/nodes/ConcatenateLayerNode.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/graph/nodes/ConcatenateLayerNode.cpp') diff --git a/src/graph/nodes/ConcatenateLayerNode.cpp b/src/graph/nodes/ConcatenateLayerNode.cpp index 3ce09d0073..bbdc4dc029 100644 --- a/src/graph/nodes/ConcatenateLayerNode.cpp +++ b/src/graph/nodes/ConcatenateLayerNode.cpp @@ -34,8 +34,8 @@ namespace arm_compute { namespace graph { -ConcatenateLayerNode::ConcatenateLayerNode(unsigned int total_nodes, DataLayoutDimension axis) - : _total_nodes(total_nodes), _axis(axis), _is_enabled(true) +ConcatenateLayerNode::ConcatenateLayerNode(unsigned int total_nodes, descriptors::ConcatLayerDescriptor concat_descriptor) + : _total_nodes(total_nodes), _concat_descriptor(std::move(concat_descriptor)), _is_enabled(true) { _input_edges.resize(_total_nodes, EmptyEdgeID); _outputs.resize(1, NullTensorID); @@ -53,7 +53,12 @@ bool ConcatenateLayerNode::is_enabled() const DataLayoutDimension ConcatenateLayerNode::concatenation_axis() const { - return _axis; + return _concat_descriptor.axis; +} + +QuantizationInfo ConcatenateLayerNode::output_quantization_info() const +{ + return _concat_descriptor.output_qinfo; } TensorDescriptor ConcatenateLayerNode::compute_output_descriptor(const std::vector &input_descriptors, @@ -121,7 +126,11 @@ TensorDescriptor ConcatenateLayerNode::configure_output(size_t idx) const ARM_COMPUTE_ERROR_ON(t == nullptr); inputs_descriptors.push_back(t->desc()); } - output_info = compute_output_descriptor(inputs_descriptors, _axis); + output_info = compute_output_descriptor(inputs_descriptors, _concat_descriptor.axis); + if(!_concat_descriptor.output_qinfo.empty()) + { + output_info.quant_info = _concat_descriptor.output_qinfo; + } } return output_info; -- cgit v1.2.1