From f0dea703ce3e2b465e79298bca95c4952a60f608 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 3 Jul 2017 18:17:28 +0100 Subject: COMPMID-417: Auto configuration for Add/Sub/Mul Neon/CL. Change-Id: I3580de76bc53d342b53443d1077b1407d75a672a Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79570 Tested-by: Kaizen Reviewed-by: Michele DiGiorgio Reviewed-by: Moritz Pflanzer --- src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp') diff --git a/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp b/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp index a4fdad8a2a..60b8006d21 100644 --- a/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp +++ b/src/core/NEON/kernels/NEArithmeticAdditionKernel.cpp @@ -294,15 +294,18 @@ void NEArithmeticAdditionKernel::configure(const ITensor *input1, const ITensor { ARM_COMPUTE_ERROR_ON_NULLPTR(input1, input2, output); - set_shape_if_empty(*output->info(), input1->info()->tensor_shape()); - - if(input1->info()->data_type() == DataType::S16 || input2->info()->data_type() == DataType::S16) - { - set_format_if_unknown(*output->info(), Format::S16); - } - else if(input1->info()->data_type() == DataType::F32 || input2->info()->data_type() == DataType::F32) + // Auto initialize output if not initialized { - set_format_if_unknown(*output->info(), Format::F32); + set_shape_if_empty(*output->info(), input1->info()->tensor_shape()); + + if(input1->info()->data_type() == DataType::S16 || input2->info()->data_type() == DataType::S16) + { + set_format_if_unknown(*output->info(), Format::S16); + } + else if(input1->info()->data_type() == DataType::F32 || input2->info()->data_type() == DataType::F32) + { + set_format_if_unknown(*output->info(), Format::F32); + } } ARM_COMPUTE_ERROR_ON_MISMATCHING_SHAPES(input1, input2, output); -- cgit v1.2.1