diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-01-09 16:45:46 +0000 |
|---|---|---|
| committer | Michele Di Giorgio <michele.digiorgio@arm.com> | 2020-01-10 16:58:20 +0000 |
| commit | 7fdcfb113cc5651eeb5f35333a41434bc4c2223f (patch) | |
| tree | 3a5cfaed83f8bb9ca88b0fdf44c263088338dc4f /arm_compute | |
| parent | 07958785a2542bf461be48241127d4ad5044d08a (diff) | |
| download | ComputeLibrary-7fdcfb113cc5651eeb5f35333a41434bc4c2223f.tar.gz | |
COMPMID-2819: Retain layout during configuration for multiple functions.
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: Ia528762dc5a93bebfd8fd037bf1f4e75d0b8a6de
Reviewed-on: https://review.mlplatform.org/c/2566
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'arm_compute')
5 files changed, 8 insertions, 3 deletions
diff --git a/arm_compute/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.h b/arm_compute/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.h index 4fa60f4e1c..8382f3b4d7 100644 --- a/arm_compute/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.h +++ b/arm_compute/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -72,6 +72,7 @@ private: const ICLTensor *_input; ICLTensor *_output; PadStrideInfo _info; + DataLayout _data_layout; }; } // namespace arm_compute #endif /*ARM_COMPUTE_CLDECONVOLUTIONLAYERUPSAMPLEKERNEL_H */ diff --git a/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h b/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h index fef0707190..b37d3a4047 100644 --- a/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLDirectConvolutionLayerKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 ARM Limited. + * Copyright (c) 2017-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -94,6 +94,7 @@ public: const ICLTensor *_biases; const ICLTensor *_weights; ICLTensor *_output; + DataLayout _data_layout; BorderSize _border_size; int _conv_stride_x; int _conv_stride_y; diff --git a/arm_compute/core/CL/kernels/CLIm2ColKernel.h b/arm_compute/core/CL/kernels/CLIm2ColKernel.h index dc95b903bd..95675c8352 100644 --- a/arm_compute/core/CL/kernels/CLIm2ColKernel.h +++ b/arm_compute/core/CL/kernels/CLIm2ColKernel.h @@ -103,6 +103,7 @@ public: public: const ICLTensor *_input; ICLTensor *_output; + DataLayout _data_layout; std::pair<unsigned int, unsigned int> _convolved_dims; unsigned int _num_elems_processed_per_iteration; Size2D _kernel_dims; diff --git a/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h b/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h index f0bf7cbddf..6f632aab46 100644 --- a/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLUpsampleLayerKernel.h @@ -73,6 +73,7 @@ private: const ICLTensor *_input; ICLTensor *_output; Size2D _info; + DataLayout _data_layout; unsigned int _num_elems_processed_per_iteration_input_x; }; } // namespace arm_compute diff --git a/arm_compute/core/CL/kernels/CLWinogradInputTransformKernel.h b/arm_compute/core/CL/kernels/CLWinogradInputTransformKernel.h index d5c8c8a8f6..03c215bf1f 100644 --- a/arm_compute/core/CL/kernels/CLWinogradInputTransformKernel.h +++ b/arm_compute/core/CL/kernels/CLWinogradInputTransformKernel.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -93,6 +93,7 @@ private: BorderSize _border_size; const ICLTensor *_input; ICLTensor *_output; + DataLayout _data_layout; int _num_tiles_x; int _num_tiles_y; unsigned int _step_z; |