diff options
| author | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-01-10 14:44:13 +0000 |
|---|---|---|
| committer | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-01-15 09:18:45 +0000 |
| commit | b66aa3b0f0fd81ae4eb383734045a55351776c7e (patch) | |
| tree | ebd78202cc1bf6b8f1ab43abec133bf0ffde5477 /src/runtime/CL/functions/CLFullyConnectedLayer.cpp | |
| parent | cbbed288a71f2f048123db3cf396361e5d66ce93 (diff) | |
| download | ComputeLibrary-b66aa3b0f0fd81ae4eb383734045a55351776c7e.tar.gz | |
COMPMID-2759 add support for QASYMM8_SIGNED to CLFullyConnectedLayer
Change-Id: I7092390b01a56065a442be0d14e2f9bfce2cdc9c
Signed-off-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2583
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/CL/functions/CLFullyConnectedLayer.cpp')
| -rw-r--r-- | src/runtime/CL/functions/CLFullyConnectedLayer.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp index ad0714ed15..dcaa12645e 100644 --- a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp +++ b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -48,8 +48,10 @@ Status construct_gemmlowp_output_stage(const ITensorInfo &input, const ITensorIn gemmlowp_output_stage.gemmlowp_multiplier = 0; gemmlowp_output_stage.gemmlowp_shift = 0; + const auto data_type = input.data_type(); + // Configure output stage for quantized case - if(is_data_type_quantized_asymmetric(input.data_type())) + if(is_data_type_quantized_asymmetric(data_type)) { const UniformQuantizationInfo iq_info = input.quantization_info().uniform(); const UniformQuantizationInfo wq_info = weights.quantization_info().uniform(); @@ -62,14 +64,18 @@ Status construct_gemmlowp_output_stage(const ITensorInfo &input, const ITensorIn int output_shift = 0; ARM_COMPUTE_RETURN_ON_ERROR(quantization::calculate_quantized_multiplier(multiplier, &output_multiplier, &output_shift)); + PixelValue type_min{}; + PixelValue type_max{}; + std::tie(type_min, type_max) = get_min_max(data_type); + // Set the GEMMLowp output stage info gemmlowp_output_stage.gemmlowp_offset = output_quant_info.offset; gemmlowp_output_stage.gemmlowp_multiplier = output_multiplier; gemmlowp_output_stage.gemmlowp_shift = output_shift; - gemmlowp_output_stage.gemmlowp_min_bound = 0; - gemmlowp_output_stage.gemmlowp_max_bound = 255; gemmlowp_output_stage.gemmlowp_multipliers.push_back(output_multiplier); gemmlowp_output_stage.gemmlowp_shifts.push_back(output_shift); + type_min.get(gemmlowp_output_stage.gemmlowp_min_bound); + type_max.get(gemmlowp_output_stage.gemmlowp_max_bound); } return Status{}; @@ -304,7 +310,7 @@ Status CLFullyConnectedLayer::validate(const ITensorInfo *input, const ITensorIn FullyConnectedLayerInfo fc_info) { ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(input, weights, output); - ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8, DataType::F16, DataType::F32); + ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QASYMM8, DataType::QASYMM8_SIGNED, DataType::F16, DataType::F32); ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, weights, output); ARM_COMPUTE_RETURN_ERROR_ON(weights->num_dimensions() > 2); |