aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiCong Li <sicong.li@arm.com>2023-03-24 15:50:51 +0000
committerSiCong Li <sicong.li@arm.com>2023-03-24 17:06:59 +0000
commitf9a547c448297cc310cad32e2cce2ce1949b4481 (patch)
treeb0772f960438f19e83e64ac8259e49118e35cbc8
parentbbeef721c285d467d003a739a1e68b2c86899750 (diff)
downloadComputeLibrary-f9a547c448297cc310cad32e2cce2ce1949b4481.tar.gz
Work around CLScale compiler-specific issue
Resolves COMPMID-5985 Signed-off-by: SiCong Li <sicong.li@arm.com> Change-Id: I0e789619f09e3adefe3655df347390f057300c0f Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9373 Reviewed-by: Gunes Bayir <gunes.bayir@arm.com> Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Benchmark: Arm Jenkins <bsgcomp@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com>
-rw-r--r--src/gpu/cl/kernels/ClScaleKernel.cpp6
1 files 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<float, float> calculate_scale_factors(const ITensorInfo *src, const ITensorInfo *dst, DataLayout data_layout, bool align_corners)
+inline std::tuple<float, float> 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<float, float> 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)