From a81fc84b37dfa7d45c58888fa4b36c2e1b483308 Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Tue, 23 Aug 2022 17:17:38 +0100 Subject: Fix macos build errors * Resolves MLCE-903 Change-Id: I39fb3b4b395a37c0f32481830f94d85ec15e205f Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8124 Reviewed-by: Gunes Bayir Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- src/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.cpp | 5 +---- src/core/helpers/WindowHelpers.h | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.cpp b/src/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.cpp index fb1754247c..0f405d8e83 100644 --- a/src/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.cpp +++ b/src/core/CPP/kernels/CPPBoxWithNonMaximaSuppressionLimitKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2020, 2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -213,11 +213,9 @@ void CPPBoxWithNonMaximaSuppressionLimitKernel::run_nmslimit() } } - int offset = 0; int cur_start_idx = 0; for(int b = 0; b < batch_size; ++b) { - const int num_boxes = _batch_splits_in == nullptr ? 1 : static_cast(*reinterpret_cast(_batch_splits_in->ptr_to_element(Coordinates(b)))); // Skip first class if there is more than 1 except if the number of classes is 1. const int j_start = (num_classes == 1 ? 0 : 1); for(int j = j_start; j < num_classes; ++j) @@ -333,7 +331,6 @@ void CPPBoxWithNonMaximaSuppressionLimitKernel::run_nmslimit() } } - offset += num_boxes; cur_start_idx += total_keep_count; } diff --git a/src/core/helpers/WindowHelpers.h b/src/core/helpers/WindowHelpers.h index dad5da62d3..28c39ccd82 100644 --- a/src/core/helpers/WindowHelpers.h +++ b/src/core/helpers/WindowHelpers.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2020-2021 Arm Limited. +* Copyright (c) 2020-2022 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -53,11 +53,9 @@ bool update_window_and_padding(Window &win, Ts &&... patterns) }, patterns...); - bool padding_changed = false; - utility::for_each([&](IAccessWindow & w) { - padding_changed |= w.update_padding_if_needed(win); + w.update_padding_if_needed(win); }, patterns...); -- cgit v1.2.1