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/DepthConcatSubTensorMutator.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/DepthConcatSubTensorMutator.cpp')
| -rw-r--r-- | src/graph/mutators/DepthConcatSubTensorMutator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/graph/mutators/DepthConcatSubTensorMutator.cpp b/src/graph/mutators/DepthConcatSubTensorMutator.cpp index a170c4d899..0e0a26b886 100644 --- a/src/graph/mutators/DepthConcatSubTensorMutator.cpp +++ b/src/graph/mutators/DepthConcatSubTensorMutator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -69,11 +69,12 @@ void DepthConcatSubTensorMutator::mutate(Graph &g) continue; } - // Check that all tensor have the same target and valid inputs + // Check that all tensor have the same target, valid inputs and same quantization info bool is_valid = std::all_of(node->input_edges().cbegin(), node->input_edges().cend(), [&](const EdgeID & eid) { - return (g.edge(eid) != nullptr) && (g.edge(eid)->tensor() != nullptr) && (g.edge(eid)->tensor()->desc().target == output_tensor->desc().target); + return (g.edge(eid) != nullptr) && (g.edge(eid)->tensor() != nullptr) && (g.edge(eid)->tensor()->desc().target == output_tensor->desc().target) + && (g.edge(eid)->tensor()->desc().quant_info == output_tensor->desc().quant_info); }); // Create subtensors |