Skip to content

Build nvforest with C++20 #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rapids-bot merged 2 commits into from
Jun 13, 2026
Merged

Build nvforest with C++20 #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81a8ba5
Build nvforest with C++20
csadorf May 19, 2026
40046e5
Fix clang-tidy C++20 flag handling
csadorf Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ set_target_properties(
PROPERTIES BUILD_RPATH "\$ORIGIN"
INSTALL_RPATH "\$ORIGIN"
# set target compile options
CXX_STANDARD 17
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
CUDA_STANDARD 17
CUDA_STANDARD 20
CUDA_STANDARD_REQUIRED ON
POSITION_INDEPENDENT_CODE ON
INTERFACE_POSITION_INDEPENDENT_CODE ON)
Expand Down
18 changes: 17 additions & 1 deletion cpp/scripts/run-clang-tidy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
GPU_ARCH_REGEX = re.compile(r"sm_(\d+)")
SPACES = re.compile(r"\s+")
SEPARATOR = "-" * 16
UNSUPPORTED_CLANG_FLAGS = (
"-fdeps-format",
"-fmodule-mapper",
)


def _read_config_file(config_file):
Expand Down Expand Up @@ -141,6 +145,17 @@ def remove_item_plus_one(arr, item):
return loc


def remove_unsupported_clang_flags(command):
return [
flag
for flag in command
if not any(
flag == unsupported_flag or flag.startswith(unsupported_flag)
for unsupported_flag in UNSUPPORTED_CLANG_FLAGS
)
]


def get_clang_tidy_version():
result = subprocess.run(
["clang-tidy", "--version"], capture_output=True, text=True, check=True
Expand Down Expand Up @@ -172,14 +187,15 @@ def get_tidy_args(cmd, exe):
# Adjust compiler command
if "c++" in command[0]:
command[0] = "clang-cpp"
command.insert(1, "-std=c++17")
command.insert(1, "-std=c++20")
elif command[0][-2:] == "cc":
command[0] = "clang"
else:
raise ValueError("Unable to identify compiler.")
# remove compilation and output targets from the original command
remove_item_plus_one(command, "-c")
remove_item_plus_one(command, "-o")
command = remove_unsupported_clang_flags(command)
if is_cuda:
# replace nvcc's "-gencode ..." with clang's "--cuda-gpu-arch ..."
archs = get_gpu_archs(command)
Expand Down
4 changes: 2 additions & 2 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ function(ConfigureTest)
set_target_properties(
${_NVFOREST_TEST_NAME}
PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib"
CXX_STANDARD 17
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
CUDA_STANDARD 17
CUDA_STANDARD 20
CUDA_STANDARD_REQUIRED ON)

set(_NVFOREST_TEST_COMPONENT_NAME testing)
Expand Down
Loading