commit 36ccc90158c65844b3c53c5462c6d7d852b97278
author Jenkins <bsgcomp@arm.com> Fri Feb 21 11:10:48 2020 +0000
committer Jenkins <bsgcomp@arm.com> Fri Feb 21 11:10:48 2020 +0000
tree 71d95e6c8af0bb8ca909bdc96dc3954963eafb59
parent 7f09cf7dfba61aad6d6d588b1b096f56bafaad5e

arm_compute v20.02

src/runtime/CL/functions/CLFullyConnectedLayer.cpp

diff --git a/src/runtime/CL/functions/CLFullyConnectedLayer.cpp b/src/runtime/CL/functions/CLFullyConnectedLayer.cpp
index a8167ce..dcaa126 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 @@
     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();
@@ -60,16 +62,20 @@
         const float multiplier        = (iq_info.scale * wq_info.scale) / output_quant_info.scale;
         int         output_multiplier = 0;
         int         output_shift      = 0;
-        ARM_COMPUTE_RETURN_ON_ERROR(quantization::calculate_quantized_multiplier_less_than_one(multiplier, &output_multiplier, &output_shift));
+        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 @@
                                        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);