From df9701960a296cb50523017a6d956d9bd59450f9 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 20 Dec 2019 10:29:12 +0000 Subject: COMPMID-2819: Retain data layout in NESpaceToDepth and NEDepthToSpace Retain layout from configuration to execution as following configuration might alter tensor meta-data in client code. Signed-off-by: Georgios Pinitas Change-Id: Ifdbb285809956b966ea534ab3ab231911a307cc0 Reviewed-on: https://review.mlplatform.org/c/2512 Reviewed-by: Pablo Marquez Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp') diff --git a/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp b/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp index 7b56c43994..ffd2dc14bf 100644 --- a/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp +++ b/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp @@ -66,7 +66,7 @@ Status validate_arguments(const ITensorInfo *input, const ITensorInfo *output, i } // namespace NESpaceToDepthLayerKernel::NESpaceToDepthLayerKernel() - : _input(nullptr), _output(nullptr), _block_shape(),_data_layout(DataLayout::UNKNOWN) + : _input(nullptr), _output(nullptr), _block_shape(), _data_layout(DataLayout::UNKNOWN) { } @@ -101,8 +101,8 @@ void NESpaceToDepthLayerKernel::run(const Window &window, const ThreadInfo &info ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICPPKernel::window(), window); - const int channel_idx = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::CHANNEL); - const int element_size = _input->info()->element_size(); + const int channel_idx = get_data_layout_dimension_index(_data_layout, DataLayoutDimension::CHANNEL); + const int element_size = _input->info()->element_size(); const size_t channel_size = _input->info()->dimension(channel_idx); @@ -111,7 +111,7 @@ void NESpaceToDepthLayerKernel::run(const Window &window, const ThreadInfo &info int batch_id = 0; // Main loop for NCHW and NHWC - if(_output->info()->data_layout() == DataLayout::NCHW) + if(_data_layout == DataLayout::NCHW) { do { -- cgit v1.2.1