diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-02-01 16:31:33 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:47:18 +0000 |
commit | ced7a8d0b4fe77d750a1e55883d5886ad9760f3b (patch) | |
tree | 3c47818c8111f48fe6e9c7e9109c93a6e2ae9a2c /arm_compute | |
parent | 1d6d211ef31698bc1864007961522dfae7bda3db (diff) | |
download | ComputeLibrary-ced7a8d0b4fe77d750a1e55883d5886ad9760f3b.tar.gz |
COMPMID-875: Deconvolution 4x4 not working
-Enforces the use of the ConvolutionLayer function in the
DeconvolutionLayer.
-Adds tests for 4x4 Deconvolution.
-Alters the ConvolutionLayer validation to support even kernels.
Change-Id: Id27e285f078e690b8dd58490dd8ea6d875b3cec6
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118632
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'arm_compute')
-rw-r--r-- | arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h | 6 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h b/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h index e98cc9b3d6..2383d2aa1d 100644 --- a/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h +++ b/arm_compute/runtime/CL/functions/CLDeconvolutionLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,8 +24,8 @@ #ifndef __ARM_COMPUTE_CLDECONVOLUTIONLAYER_H__ #define __ARM_COMPUTE_CLDECONVOLUTIONLAYER_H__ +#include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" #include "arm_compute/runtime/CL/functions/CLDeconvolutionLayerUpsample.h" -#include "arm_compute/runtime/CL/functions/CLDirectConvolutionLayer.h" #include "arm_compute/runtime/CL/CLMemoryGroup.h" #include "arm_compute/runtime/CL/CLTensor.h" @@ -96,7 +96,7 @@ public: private: CLMemoryGroup _memory_group; CLDeconvolutionLayerUpsample _scale_f; - CLDirectConvolutionLayer _conv_f; + CLConvolutionLayer _conv_f; CLTensor _scaled_output; }; } diff --git a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h index 091a928db6..1b3297e8d0 100644 --- a/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h +++ b/arm_compute/runtime/NEON/functions/NEDeconvolutionLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -24,6 +24,7 @@ #ifndef __ARM_COMPUTE_NEDECONVOLUTIONLAYER_H__ #define __ARM_COMPUTE_NEDECONVOLUTIONLAYER_H__ +#include "arm_compute/runtime/NEON/functions/NEConvolutionLayer.h" #include "arm_compute/runtime/NEON/functions/NEDirectConvolutionLayer.h" #include "arm_compute/core/Types.h" @@ -95,11 +96,13 @@ public: private: MemoryGroup _memory_group; - NEDirectConvolutionLayer _conv_f; + NEDirectConvolutionLayer _direct_conv_f; + NEConvolutionLayer _conv_f; Tensor _scaled_output; ITensor *_input; PadStrideInfo _info; std::pair<unsigned int, unsigned int> _inner_border; + bool _run_direct_convolution; }; } // arm_compute #endif /* __ARM_COMPUTE_NEDECONVOLUTIONLAYER_H__ */ |