aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgios Pinitas <georgios.pinitas@arm.com>2020-01-07 17:37:14 +0000
committerGeorgios Pinitas <georgios.pinitas@arm.com>2020-01-09 16:27:54 +0000
commit156208d1b5874f3fda428bf379d376ffb697c971 (patch)
tree0c27af3df6d1cfb24db91a426278f5461470a4bc
parente559ea80da5b62c860b268e8d369c8d1026627bf (diff)
downloadComputeLibrary-156208d1b5874f3fda428bf379d376ffb697c971.tar.gz
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 <georgios.pinitas@arm.com> Reviewed-on: https://review.mlplatform.org/c/2545 Reviewed-by: Pablo Marquez <pablo.tello@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r--src/core/NEON/kernels/NEScaleKernel.cpp4
1 files 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);