From ec8b45e7333006ae06d834e300c11a4fd1b4c067 Mon Sep 17 00:00:00 2001 From: Gian Marco Iodice Date: Thu, 22 Jun 2017 13:00:39 +0100 Subject: COMPMID-345 - Auto-inizialization for NECol2ImKernel and NEGEMMInterleave4x4Kernel Added support for 8 bit fixed point in CLTransposeKernel Change-Id: I8257fa30e90e70825c97c16b0a11af73c426319c Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78563 Reviewed-by: Moritz Pflanzer Tested-by: Kaizen Reviewed-by: Georgios Pinitas --- src/core/NEON/kernels/NETransposeKernel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/NEON/kernels/NETransposeKernel.cpp') diff --git a/src/core/NEON/kernels/NETransposeKernel.cpp b/src/core/NEON/kernels/NETransposeKernel.cpp index 492de8a6ee..a990e9068e 100644 --- a/src/core/NEON/kernels/NETransposeKernel.cpp +++ b/src/core/NEON/kernels/NETransposeKernel.cpp @@ -180,7 +180,7 @@ NETransposeKernel::NETransposeKernel() void NETransposeKernel::configure(const ITensor *input, ITensor *output) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::U8, DataType::S8, DataType::QS8, DataType::U16, DataType::S16, DataType::U32, DataType::S32, DataType::F16, DataType::F32); - ARM_COMPUTE_ERROR_ON(output == nullptr); + ARM_COMPUTE_ERROR_ON_NULLPTR(output); TensorShape output_shape{ input->info()->tensor_shape() }; const size_t w_out = input->info()->dimension(1); @@ -191,8 +191,9 @@ void NETransposeKernel::configure(const ITensor *input, ITensor *output) // Output tensor auto inizialitation if not yet initialized auto_init_if_empty(*output->info(), output_shape, 1, input->info()->data_type(), input->info()->fixed_point_position()); - ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); ARM_COMPUTE_ERROR_ON_MISMATCHING_DIMENSIONS(output->info()->tensor_shape(), output_shape); + ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); + ARM_COMPUTE_ERROR_ON_MISMATCHING_FIXED_POINT(input, output); _input = input; _output = output; -- cgit v1.2.1