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/backends | |
| 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/backends')
| -rw-r--r-- | src/graph/backends/CL/CLNodeValidator.cpp | 2 | ||||
| -rw-r--r-- | src/graph/backends/NEON/NEFunctionFactory.cpp | 6 | ||||
| -rw-r--r-- | src/graph/backends/NEON/NENodeValidator.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/graph/backends/CL/CLNodeValidator.cpp b/src/graph/backends/CL/CLNodeValidator.cpp index 4b71837a49..cb8dc0a172 100644 --- a/src/graph/backends/CL/CLNodeValidator.cpp +++ b/src/graph/backends/CL/CLNodeValidator.cpp @@ -74,6 +74,8 @@ Status CLNodeValidator::validate(INode *node) return detail::validate_priorbox_layer<CLPriorBoxLayer>(*polymorphic_downcast<PriorBoxLayerNode *>(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer<CLReorgLayer>(*polymorphic_downcast<ReorgLayerNode *>(node)); + case NodeType::ReshapeLayer: + return detail::validate_reshape_layer<CLReshapeLayer>(*polymorphic_downcast<ReshapeLayerNode *>(node)); case NodeType::ROIAlignLayer: return detail::validate_roi_align_layer<CLROIAlignLayer>(*polymorphic_downcast<ROIAlignLayerNode *>(node)); case NodeType::SliceLayer: diff --git a/src/graph/backends/NEON/NEFunctionFactory.cpp b/src/graph/backends/NEON/NEFunctionFactory.cpp index f23845c314..81c6e09f92 100644 --- a/src/graph/backends/NEON/NEFunctionFactory.cpp +++ b/src/graph/backends/NEON/NEFunctionFactory.cpp @@ -143,8 +143,10 @@ std::unique_ptr<IFunction> create_convolution_layer<NEConvolutionLayerFunctions, << " Weights QuantInfo: " << weights->info()->quantization_info() << " Output QuantInfo: " << output->info()->quantization_info(); } - ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " << func_name - << " Target " << NETargetInfo::TargetType + ARM_COMPUTE_LOG_GRAPH_INFO("Instantiated " + << node.name() + << " Type: " << func_name + << " Target: " << NETargetInfo::TargetType << " Data Type: " << input->info()->data_type() << qss.str() << " Input shape: " << input->info()->tensor_shape() diff --git a/src/graph/backends/NEON/NENodeValidator.cpp b/src/graph/backends/NEON/NENodeValidator.cpp index b0feec563b..77f2e7f21d 100644 --- a/src/graph/backends/NEON/NENodeValidator.cpp +++ b/src/graph/backends/NEON/NENodeValidator.cpp @@ -74,6 +74,8 @@ Status NENodeValidator::validate(INode *node) return detail::validate_priorbox_layer<NEPriorBoxLayer>(*polymorphic_downcast<PriorBoxLayerNode *>(node)); case NodeType::ReorgLayer: return detail::validate_reorg_layer<NEReorgLayer>(*polymorphic_downcast<ReorgLayerNode *>(node)); + case NodeType::ReshapeLayer: + return detail::validate_reshape_layer<NEReshapeLayer>(*polymorphic_downcast<ReshapeLayerNode *>(node)); case NodeType::ROIAlignLayer: return ARM_COMPUTE_CREATE_ERROR(arm_compute::ErrorCode::RUNTIME_ERROR, "Unsupported operation : ROIAlignLayer"); case NodeType::SliceLayer: |