From f9a547c448297cc310cad32e2cce2ce1949b4481 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Fri, 24 Mar 2023 15:50:51 +0000 Subject: Work around CLScale compiler-specific issue Resolves COMPMID-5985 Signed-off-by: SiCong Li Change-Id: I0e789619f09e3adefe3655df347390f057300c0f Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9373 Reviewed-by: Gunes Bayir Reviewed-by: Pablo Marquez Tello Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- src/gpu/cl/kernels/ClScaleKernel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gpu/cl/kernels/ClScaleKernel.cpp b/src/gpu/cl/kernels/ClScaleKernel.cpp index 7f24aa2eb6..910287194e 100644 --- a/src/gpu/cl/kernels/ClScaleKernel.cpp +++ b/src/gpu/cl/kernels/ClScaleKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2022 Arm Limited. + * Copyright (c) 2016-2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -39,7 +39,7 @@ namespace kernels { namespace { -inline std::pair calculate_scale_factors(const ITensorInfo *src, const ITensorInfo *dst, DataLayout data_layout, bool align_corners) +inline std::tuple calculate_scale_factors(const ITensorInfo *src, const ITensorInfo *dst, DataLayout data_layout, bool align_corners) { 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); @@ -53,7 +53,7 @@ inline std::pair calculate_scale_factors(const ITensorInfo *src, c float scale_x = arm_compute::scale_utils::calculate_resize_ratio(src_width, dst_width, align_corners); float scale_y = arm_compute::scale_utils::calculate_resize_ratio(src_height, dst_height, align_corners); - return std::make_pair(scale_x, scale_y); + return std::make_tuple(scale_x, scale_y); } Status validate_arguments(const ITensorInfo *src, const ITensorInfo *dst, const ScaleKernelInfo &info) -- cgit v1.2.1