diff options
author | Isabella Gottardi <isabella.gottardi@arm.com> | 2019-03-14 10:32:11 +0000 |
---|---|---|
committer | Isabella Gottardi <isabella.gottardi@arm.com> | 2019-03-20 11:23:43 +0000 |
commit | 0ae5de9124a0094e656244ad2f807c084966fc04 (patch) | |
tree | ab698ad9c43f95dda13f78cf76b753105cf69388 /src/graph/mutators/NodeFusionMutator.cpp | |
parent | b0c5037d94ba7073ccabb0ebaff54db320f184c4 (diff) | |
download | ComputeLibrary-0ae5de9124a0094e656244ad2f807c084966fc04.tar.gz |
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>
Diffstat (limited to 'src/graph/mutators/NodeFusionMutator.cpp')
-rw-r--r-- | src/graph/mutators/NodeFusionMutator.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/graph/mutators/NodeFusionMutator.cpp b/src/graph/mutators/NodeFusionMutator.cpp index 5927a597bb..724307e7b7 100644 --- a/src/graph/mutators/NodeFusionMutator.cpp +++ b/src/graph/mutators/NodeFusionMutator.cpp @@ -211,10 +211,17 @@ void NodeFusionMutator::mutate(Graph &g) { return true; }; - auto qs8_prec = [](INode & n) + auto qs8_prec = [&g](INode & n) { ARM_COMPUTE_ERROR_ON(n.output(0) == nullptr); - return n.output(0)->desc().data_type == DataType::QASYMM8; + + const auto output_edge_id = *n.output_edges().begin(); + const auto output_edge = g.edge(output_edge_id); + // To perform fusion the two nodes must have same output quantization information + const bool same_qinfo = n.output(0)->desc().quant_info == output_edge->producer()->output(0)->desc().quant_info; + const bool output_qasymm8 = n.output(0)->desc().data_type == DataType::QASYMM8; + + return output_qasymm8 && same_qinfo; }; // Fusion mutations |