From b037a4916276c5f206b528d0fc550dfab7dbb818 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Thu, 15 Aug 2019 15:11:45 +0100 Subject: COMPMID-2336: Fix call to validate in NEDeconvolutionLayer Change-Id: I15c16490f77b4346d3559f8edd0ca7bfd82d1961 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/1749 Reviewed-by: Pablo Marquez Tested-by: Arm Jenkins --- src/runtime/NEON/functions/NEDeconvolutionLayer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp b/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp index 581f257581..4db1346654 100644 --- a/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp +++ b/src/runtime/NEON/functions/NEDeconvolutionLayer.cpp @@ -111,8 +111,9 @@ Status NEDeconvolutionLayer::validate(const ITensorInfo *input, const ITensorInf void NEDeconvolutionLayer::configure(ITensor *input, const ITensor *weights, const ITensor *bias, ITensor *output, const PadStrideInfo &info) { + // Perform validation step ARM_COMPUTE_ERROR_ON_NULLPTR(input, weights, output); - ARM_COMPUTE_ERROR_THROW_ON(NEDeconvolutionLayer::validate(input->info(), weights->info(), bias->info(), output->info(), info)); + ARM_COMPUTE_ERROR_THROW_ON(NEDeconvolutionLayer::validate(input->info(), weights->info(), (bias == nullptr) ? nullptr : bias->info(), output->info(), info)); const DataLayout data_layout = input->info()->data_layout(); @@ -135,9 +136,6 @@ void NEDeconvolutionLayer::configure(ITensor *input, const ITensor *weights, con // Output auto initialization if not yet initialized auto_init_if_empty(*output->info(), output_shape, 1, input->info()->data_type(), input->info()->quantization_info()); - // Perform validation step - ARM_COMPUTE_ERROR_THROW_ON(NEDeconvolutionLayer::validate(input->info(), weights->info(), bias == nullptr ? nullptr : bias->info(), output->info(), info)); - _memory_group.manage(&_scaled_output); if(!_is_nchw) -- cgit v1.2.1