From 296580423e262c8914ebf50b378730ed47c0b323 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Mon, 11 May 2020 10:35:08 +0100 Subject: IVGCVSW-4744 CTS: RandomGraphTest LargeGraph failures in CpuAcc HAL 1.2 and 1.3 * Retain data layout for SpaceToBatchLayerKernel and BatchToSpaceLayerKernel Signed-off-by: Sadik Armagan Change-Id: I5bd0c3ca90a4964eda9f838c97c784aced0f4579 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3166 Reviewed-by: Manuel Bottini Reviewed-by: Gian Marco Iodice Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp') diff --git a/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp b/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp index d167cbb05d..c4c0f01f0f 100644 --- a/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp +++ b/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -82,7 +82,7 @@ Status validate_arguments_static(const ITensorInfo *input, const int block_shape } // namespace NEBatchToSpaceLayerKernel::NEBatchToSpaceLayerKernel() - : _input(nullptr), _block_shape(nullptr), _output(nullptr), _block_shape_x(), _block_shape_y() + : _input(nullptr), _block_shape(nullptr), _output(nullptr), _data_layout(DataLayout::UNKNOWN), _block_shape_x(), _block_shape_y() { } @@ -94,6 +94,7 @@ void NEBatchToSpaceLayerKernel::configure(const ITensor *input, const ITensor *b _input = input; _block_shape = block_shape; _output = output; + _data_layout = input->info()->data_layout(); // Configure kernel window Window win = calculate_max_window(*input->info(), Steps()); @@ -114,6 +115,7 @@ void NEBatchToSpaceLayerKernel::configure(const ITensor *input, const int32_t bl _output = output; _block_shape_x = block_shape_x; _block_shape_y = block_shape_y; + _data_layout = input->info()->data_layout(); // Configure kernel window Window win = calculate_max_window(*input->info(), Steps()); @@ -162,7 +164,7 @@ void NEBatchToSpaceLayerKernel::run(const Window &window, const ThreadInfo &info int batch_id = 0; // Main loop for NCHW and NHWC - if(_input->info()->data_layout() == DataLayout::NCHW) + if(_data_layout == DataLayout::NCHW) { do { -- cgit v1.2.1