From 156208d1b5874f3fda428bf379d376ffb697c971 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 7 Jan 2020 17:37:14 +0000 Subject: COMPMID-2819: Fix data layout in NEScaleKernel for nhwc. Instead of retrieving the data layout from the tensors, fix it to NHWC as the selected function is already specialized for NWHC. Change-Id: I67d8ca8b911adb8575e4c4a6232731b423a3604b Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/2545 Reviewed-by: Pablo Marquez Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/core/NEON/kernels/NEScaleKernel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/NEON/kernels/NEScaleKernel.cpp b/src/core/NEON/kernels/NEScaleKernel.cpp index a2a44fca18..5b8e196a2c 100644 --- a/src/core/NEON/kernels/NEScaleKernel.cpp +++ b/src/core/NEON/kernels/NEScaleKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019 ARM Limited. + * Copyright (c) 2016-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -909,7 +909,7 @@ void NEScaleKernel::scale_area_nchw(const Window &window) void NEScaleKernel::scale_nhwc(const Window &window) { // Get data layout and width/height indices - const DataLayout data_layout = _input->info()->data_layout(); + const DataLayout data_layout = DataLayout::NHWC; const int idx_channels = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL); const int idx_width = get_data_layout_dimension_index(data_layout, DataLayoutDimension::WIDTH); const int idx_height = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); -- cgit v1.2.1