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 /src/core/CL/kernels/CLIm2ColKernel.cpp | |
| 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 'src/core/CL/kernels/CLIm2ColKernel.cpp')
| -rw-r--r-- | src/core/CL/kernels/CLIm2ColKernel.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/CL/kernels/CLIm2ColKernel.cpp b/src/core/CL/kernels/CLIm2ColKernel.cpp index 5dfc26fbcc..c5be4adc8b 100644 --- a/src/core/CL/kernels/CLIm2ColKernel.cpp +++ b/src/core/CL/kernels/CLIm2ColKernel.cpp @@ -288,7 +288,7 @@ Im2ColConfiguration configure_opencl_kernel(const ITensorInfo *input, const Size } // namespace CLIm2ColKernel::CLIm2ColKernel() - : _input(nullptr), _output(nullptr), _convolved_dims(), _num_elems_processed_per_iteration(1), _kernel_dims(), _conv_info(), _num_groups() + : _input(nullptr), _output(nullptr), _data_layout(DataLayout::UNKNOWN), _convolved_dims(), _num_elems_processed_per_iteration(1), _kernel_dims(), _conv_info(), _num_groups() { } @@ -298,9 +298,10 @@ void CLIm2ColKernel::configure(const ICLTensor *input, ICLTensor *output, const ARM_COMPUTE_ERROR_ON_NULLPTR(input, output); ARM_COMPUTE_ERROR_THROW_ON(validate_arguments(input->info(), output->info(), kernel_dims, conv_info, has_bias, dilation, num_groups)); - const DataLayout data_layout = input->info()->data_layout(); - const unsigned int width_idx = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); - const unsigned int height_idx = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); + _data_layout = input->info()->data_layout(); + + const unsigned int width_idx = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::WIDTH); + const unsigned int height_idx = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::HEIGHT); const unsigned int input_width = input->info()->dimension(width_idx); const unsigned int input_height = input->info()->dimension(height_idx); @@ -337,7 +338,7 @@ void CLIm2ColKernel::configure(const ICLTensor *input, ICLTensor *output, const _config_id += "_"; _config_id += support::cpp11::to_string(output->info()->dimension(1)); _config_id += "_"; - _config_id += lower_string(string_from_data_layout(input->info()->data_layout())); + _config_id += lower_string(string_from_data_layout(_data_layout)); } Status CLIm2ColKernel::validate(const ITensorInfo *input, const ITensorInfo *output, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const Size2D &dilation, @@ -370,7 +371,7 @@ void CLIm2ColKernel::run(const Window &window, cl::CommandQueue &queue) Window slice_in = first_slice_3d; Window slice_out = window_output.first_slice_window_2D(); - if(_input->info()->data_layout() == DataLayout::NHWC) + if(_data_layout == DataLayout::NHWC) { const Window tmp_win = window.collapse_if_possible(ICLKernel::window(), 3); const int num_batches = tmp_win[3].end(); |