diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-12-20 10:29:12 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-12-20 11:54:26 +0000 |
commit | 0e4556ce45cb857ac44354df73f8228475f3ad3c (patch) | |
tree | 4119efa5206f58c1ceb31b6d0dd53f1484ab352f /src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp | |
parent | 0779fecbf897fe85c5e13da52b129e439c4cc75d (diff) | |
download | ComputeLibrary-0e4556ce45cb857ac44354df73f8228475f3ad3c.tar.gz |
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 <georgios.pinitas@arm.com>
Change-Id: Ifdbb285809956b966ea534ab3ab231911a307cc0
Reviewed-on: https://review.mlplatform.org/c/2512
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp')
-rw-r--r-- | src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp b/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp index bc27a3c76a..4087d8c8d3 100644 --- a/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp +++ b/src/core/NEON/kernels/NESpaceToDepthLayerKernel.cpp @@ -67,7 +67,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) { } @@ -102,8 +102,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); @@ -112,7 +112,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 { |