From 2607ba1261b309029603377dea80e71fcc0f5ee4 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 19 Feb 2019 18:47:46 +0000 Subject: COMPMID-1710: Quantization information missmatching issues. Change-Id: I6a38fd270476bb072384c39bbfdcc940f258fd53 Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/730 Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- src/core/NEON/kernels/NEScaleKernel.cpp | 1 - src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/NEON/kernels/NEScaleKernel.cpp b/src/core/NEON/kernels/NEScaleKernel.cpp index 4cb7c3dd56..3d300ef26b 100644 --- a/src/core/NEON/kernels/NEScaleKernel.cpp +++ b/src/core/NEON/kernels/NEScaleKernel.cpp @@ -51,7 +51,6 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *dx, const ARM_COMPUTE_RETURN_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8, DataType::S16, DataType::F16, DataType::F32, DataType::QASYMM8); ARM_COMPUTE_RETURN_ERROR_ON_NULLPTR(output); ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); - ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_QUANTIZATION_INFO(input, output); ARM_COMPUTE_RETURN_ERROR_ON(output == input); ARM_COMPUTE_RETURN_ERROR_ON(sampling_policy != SamplingPolicy::CENTER && sampling_policy != SamplingPolicy::TOP_LEFT); ARM_COMPUTE_UNUSED(border_mode); diff --git a/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp index db7f9af420..f0fd4cf256 100644 --- a/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDepthwiseConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -72,7 +72,7 @@ void NEDepthwiseConvolutionLayer3x3::configure(ITensor *input, const ITensor *we accum_layout = DataLayout::NCHW; } - _accumulator.allocator()->init(TensorInfo(accum_shape, 1, DataType::S32, input->info()->quantization_info())); + _accumulator.allocator()->init(TensorInfo(accum_shape, 1, DataType::S32, output->info()->quantization_info())); _accumulator.info()->set_data_layout(accum_layout); zero_value = PixelValue(static_cast(input->info()->quantization_info().offset)); } -- cgit v1.2.1