From 4d600c728a75792c5479b54114ec11c6d8fea61a Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 30 Jul 2019 15:09:10 +0100 Subject: COMPMID-2500: Report error in Int8 Conv2d if multiplier > 1. Change-Id: I7d0263eddfb4f9cf0145e94b35d5f9e18737cd2d Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/1653 Tested-by: Arm Jenkins Reviewed-by: Pablo Marquez Comments-Addressed: Arm Jenkins --- src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp b/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp index bd46944f7a..e94c8933ae 100644 --- a/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEGEMMConvolutionLayer.cpp @@ -187,7 +187,7 @@ Status NEGEMMConvolutionLayer::validate_mm(const ITensorInfo *input, const ITens float multiplier = iqinfo.scale * wqinfo.scale / oqinfo.scale; int output_multiplier; int output_shift; - quantization::calculate_quantized_multiplier_less_than_one(multiplier, &output_multiplier, &output_shift); + ARM_COMPUTE_RETURN_ON_ERROR(quantization::calculate_quantized_multiplier_less_than_one(multiplier, &output_multiplier, &output_shift)); // Merge activation with output stage int min_activation = 0; @@ -492,6 +492,7 @@ Status NEGEMMConvolutionLayer::validate(const ITensorInfo *input, const ITensorI // Output tensor auto inizialization if not yet initialized ARM_COMPUTE_RETURN_ON_ERROR(NEConvolutionLayerReshapeWeights::validate(weights, biases_to_use, nullptr)); weights_reshaped_info = TensorInfo(compute_weights_reshaped_shape(*weights, (append_bias && !skip_im2col)), 1, data_type); + weights_reshaped_info.set_quantization_info(weights->quantization_info()); weights_to_use = &weights_reshaped_info; if(!skip_im2col) -- cgit v1.2.1