diff options
author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2019-08-15 15:11:45 +0100 |
---|---|---|
committer | Giorgio Arena <giorgio.arena@arm.com> | 2019-08-15 15:34:14 +0000 |
commit | 0c5191c35aa99c156a754826813f0fbd7097279a (patch) | |
tree | db047f6ead6cb315824b0cc1243e426f4e5c252e /src/runtime/NEON/functions | |
parent | 70e890e45c4adc69963240b0ca8c2016566d8c18 (diff) | |
download | ComputeLibrary-0c5191c35aa99c156a754826813f0fbd7097279a.tar.gz |
COMPMID-2336: Fix call to validate in NEDeconvolutionLayer
Change-Id: I15c16490f77b4346d3559f8edd0ca7bfd82d1961
Signed-off-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1749
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/NEON/functions')
-rw-r--r-- | src/runtime/NEON/functions/NEDeconvolutionLayer.cpp | 6 |
1 files 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) |