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 /arm_compute/graph/LayerDescriptors.h | |
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 'arm_compute/graph/LayerDescriptors.h')
-rw-r--r-- | arm_compute/graph/LayerDescriptors.h | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/arm_compute/graph/LayerDescriptors.h b/arm_compute/graph/LayerDescriptors.h new file mode 100644 index 0000000000..79099326ec --- /dev/null +++ b/arm_compute/graph/LayerDescriptors.h @@ -0,0 +1,69 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_CONCAT_DESCRIPTOR_H__ +#define __ARM_COMPUTE_CONCAT_DESCRIPTOR_H__ + +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +namespace graph +{ +namespace descriptors +{ +/** Common node parameters */ +struct ConcatLayerDescriptor +{ + /** Default constructor */ + ConcatLayerDescriptor() + : axis(DataLayoutDimension::CHANNEL), output_qinfo() + { + } + + /** Constructor concatenate layer descriptor + * + * @param[in] axis Axis. + */ + ConcatLayerDescriptor(DataLayoutDimension axis) + : axis(axis), output_qinfo() + { + } + + /** Constructor concatenate layer descriptor + * + * @param[in] axis Axis. + * @param[in] output_qinfo Output quantization info. + */ + ConcatLayerDescriptor(DataLayoutDimension axis, QuantizationInfo output_qinfo) + : axis(axis), output_qinfo(output_qinfo) + { + } + + const DataLayoutDimension axis; /**< Concatenation Axis */ + const QuantizationInfo output_qinfo; /**< Output quantizazion info */ +}; +} // namespace descriptor +} // namespace graph +} // namespace arm_compute +#endif /* __ARM_COMPUTE_CONCAT_DESCRIPTOR_H__ */
\ No newline at end of file |