diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-01-07 17:37:14 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-01-10 17:14:49 +0000 |
| commit | 1b4b1a7f79533d1f4483c5f284111a899b50691b (patch) | |
| tree | 49fcd3b089a7687088404e20467fa2ac70b809ec | |
| parent | df9701960a296cb50523017a6d956d9bd59450f9 (diff) | |
| download | ComputeLibrary-1b4b1a7f79533d1f4483c5f284111a899b50691b.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.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/NEON/kernels/NEScaleKernel.cpp b/src/core/NEON/kernels/NEScaleKernel.cpp index 80da54f50a..1cea8c6714 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); |