From eb6c88ae253f1a6555a741d6e5a04033a95486a7 Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Thu, 7 Feb 2019 15:53:19 +0000 Subject: COMPMID-1918: Different qinfos support in CLConcatLayer Added support in CLDepthConcatenateLayerKernel and CLWidthConcatenateLayer for different quantization arguments both for the input and output. If input's quantization infos are not homogeneous the input values are requantized using the output's quantization info. Change-Id: Ib5446d0c6790c2fe6e7172e87e4f2833247436db Signed-off-by: Pablo Tello Reviewed-on: https://review.mlplatform.org/650 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- src/runtime/CL/functions/CLWidthConcatenateLayer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/runtime/CL') diff --git a/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp b/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp index 46a2d80d10..d0801a6768 100644 --- a/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp +++ b/src/runtime/CL/functions/CLWidthConcatenateLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -50,8 +50,8 @@ Status CLWidthConcatenateLayer::validate(const std::vector &input ARM_COMPUTE_RETURN_ERROR_ON(num_inputs < 2); // Output auto inizialitation if not yet initialized - TensorInfo tmp_output_info = *output->clone(); - TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_width_concatenate_shape(inputs_vector); + TensorInfo tmp_output_info = *output->clone(); + const TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_width_concatenate_shape(inputs_vector); auto_init_if_empty(tmp_output_info, output_shape, 1, inputs_vector[0]->data_type()); switch(num_inputs) @@ -90,7 +90,7 @@ void CLWidthConcatenateLayer::configure(std::vector inputs_vector, { inputs_vector_info.emplace_back(inputs_vector.at(i)->info()); } - TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_width_concatenate_shape(inputs_vector); + const TensorShape output_shape = arm_compute::misc::shape_calculator::calculate_width_concatenate_shape(inputs_vector); // Output auto inizialitation if not yet initialized auto_init_if_empty(*output->info(), output_shape, 1, inputs_vector[0]->info()->data_type()); -- cgit v1.2.1