From b0f0a85ac6f6e48e419a74c7c03a3aca38ee6dfb Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Wed, 10 Jun 2026 16:39:38 -0500 Subject: [PATCH 1/2] FIX Fix clang-tidy failures in CUDA 13.2 CI --- cpp/.clang-tidy | 1 - cpp/scripts/run-clang-tidy.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cpp/.clang-tidy b/cpp/.clang-tidy index 37651f0c26..06e3691901 100644 --- a/cpp/.clang-tidy +++ b/cpp/.clang-tidy @@ -2,7 +2,6 @@ Checks: 'clang-diagnostic-*,clang-analyzer-*,-modernize-*,-clang-diagnostic-#pragma-messages,-readability-identifier-naming,-clang-diagnostic-switch' WarningsAsErrors: '*' HeaderFilterRegex: '' -AnalyzeTemporaryDtors: false FormatStyle: none CheckOptions: - key: cert-dcl16-c.NewSuffixes diff --git a/cpp/scripts/run-clang-tidy.py b/cpp/scripts/run-clang-tidy.py index cc6cbbd399..92d6c6959c 100755 --- a/cpp/scripts/run-clang-tidy.py +++ b/cpp/scripts/run-clang-tidy.py @@ -19,6 +19,7 @@ GPU_ARCH_REGEX = re.compile(r"sm_(\d+)") SPACES = re.compile(r"\s+") SEPARATOR = "-" * 16 +UNSUPPORTED_CLANG_FLAGS = ("-fno-merge-constants",) def _read_config_file(config_file): @@ -180,6 +181,9 @@ def get_tidy_args(cmd, exe): # remove compilation and output targets from the original command remove_item_plus_one(command, "-c") remove_item_plus_one(command, "-o") + for flag in UNSUPPORTED_CLANG_FLAGS: + while remove_item(command, flag) >= 0: + pass if is_cuda: # replace nvcc's "-gencode ..." with clang's "--cuda-gpu-arch ..." archs = get_gpu_archs(command) From fff675a29a12bd3170e8a307076f82f1d804cfc9 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Wed, 10 Jun 2026 16:45:51 -0500 Subject: [PATCH 2/2] FIX style fixes --- cpp/scripts/run-clang-tidy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/scripts/run-clang-tidy.py b/cpp/scripts/run-clang-tidy.py index 92d6c6959c..a771823883 100755 --- a/cpp/scripts/run-clang-tidy.py +++ b/cpp/scripts/run-clang-tidy.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright (c) 2020-2025, NVIDIA CORPORATION. +# SPDX-FileCopyrightText: Copyright (c) 2020-2026, NVIDIA CORPORATION. # SPDX-License-Identifier: Apache-2.0 #