Skip to content

Commit 403b743

Browse files
PointKernelPointKernel
committed
Merge remote-tracking branch 'upstream/dev' into fix-doxygen-ci
2 parents 17f5626 + 8a28cb0 commit 403b743

File tree

220 files changed

+29825
-24289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+29825
-24289
lines changed

‎.devcontainer/cuda11.8-gcc11/devcontainer.json‎ renamed to ‎.devcontainer/cuda12.0-gcc11/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.12-cpp-gcc11-cuda11.8-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.10-cpp-gcc11-cuda12.0-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},
@@ -14,8 +14,8 @@
1414
"SCCACHE_BUCKET": "rapids-sccache-devs",
1515
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1616
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
17-
"DEVCONTAINER_NAME": "cuda11.8-gcc11",
18-
"CUCO_CUDA_VERSION": "11.8",
17+
"DEVCONTAINER_NAME": "cuda12.0-gcc11",
18+
"CUCO_CUDA_VERSION": "12.0",
1919
"CUCO_HOST_COMPILER": "gcc",
2020
"CUCO_HOST_COMPILER_VERSION": "11"
2121
},
@@ -38,5 +38,5 @@
3838
}
3939
}
4040
},
41-
"name": "cuda11.8-gcc11"
41+
"name": "cuda12.0-gcc11"
4242
}

‎.devcontainer/cuda12.6-gcc12/devcontainer.json‎ renamed to ‎.devcontainer/cuda12.0-llvm14/devcontainer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.12-cpp-gcc12-cuda12.6-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.10-cpp-llvm14-cuda12.0-ubuntu20.04",
44
"hostRequirements": {
55
"gpu": true
66
},
@@ -14,10 +14,10 @@
1414
"SCCACHE_BUCKET": "rapids-sccache-devs",
1515
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1616
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
17-
"DEVCONTAINER_NAME": "cuda12.6-gcc12",
18-
"CUCO_CUDA_VERSION": "12.6",
19-
"CUCO_HOST_COMPILER": "gcc",
20-
"CUCO_HOST_COMPILER_VERSION": "12"
17+
"DEVCONTAINER_NAME": "cuda12.0-llvm14",
18+
"CUCO_CUDA_VERSION": "12.0",
19+
"CUCO_HOST_COMPILER": "llvm",
20+
"CUCO_HOST_COMPILER_VERSION": "14"
2121
},
2222
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
2323
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
@@ -38,5 +38,5 @@
3838
}
3939
}
4040
},
41-
"name": "cuda12.6-gcc12"
41+
"name": "cuda12.0-llvm14"
4242
}

‎.devcontainer/cuda12.6-gcc13/devcontainer.json‎ renamed to ‎.devcontainer/cuda12.9-gcc13/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.10-cpp-gcc13-cuda12.9-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},
@@ -14,8 +14,8 @@
1414
"SCCACHE_BUCKET": "rapids-sccache-devs",
1515
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1616
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
17-
"DEVCONTAINER_NAME": "cuda12.6-gcc13",
18-
"CUCO_CUDA_VERSION": "12.6",
17+
"DEVCONTAINER_NAME": "cuda12.9-gcc13",
18+
"CUCO_CUDA_VERSION": "12.9",
1919
"CUCO_HOST_COMPILER": "gcc",
2020
"CUCO_HOST_COMPILER_VERSION": "13"
2121
},
@@ -38,5 +38,5 @@
3838
}
3939
}
4040
},
41-
"name": "cuda12.6-gcc13"
41+
"name": "cuda12.9-gcc13"
4242
}

‎.devcontainer/cuda12.9-llvm18/devcontainer.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"shutdownAction": "stopContainer",
3+
"image": "rapidsai/devcontainers:25.10-cpp-llvm18-cuda12.9-ubuntu22.04",
4+
"hostRequirements": {
5+
"gpu": true
6+
},
7+
"initializeCommand": [
8+
"/bin/bash",
9+
"-c",
10+
"mkdir -m 0755 -p ${localWorkspaceFolder}/.{aws,cache,config}"
11+
],
12+
"containerEnv": {
13+
"SCCACHE_REGION": "us-east-2",
14+
"SCCACHE_BUCKET": "rapids-sccache-devs",
15+
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
16+
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
17+
"DEVCONTAINER_NAME": "cuda12.9-llvm18",
18+
"CUCO_CUDA_VERSION": "12.9",
19+
"CUCO_HOST_COMPILER": "llvm",
20+
"CUCO_HOST_COMPILER_VERSION": "18"
21+
},
22+
"workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",
23+
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind,consistency=consistent",
24+
"mounts": [
25+
"source=${localWorkspaceFolder}/.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
26+
"source=${localWorkspaceFolder}/.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
27+
"source=${localWorkspaceFolder}/.config,target=/home/coder/.config,type=bind,consistency=consistent"
28+
],
29+
"customizations": {
30+
"vscode": {
31+
"extensions": [
32+
"llvm-vs-code-extensions.vscode-clangd"
33+
],
34+
"settings": {
35+
"clangd.arguments": [
36+
"--compile-commands-dir=${workspaceFolder}/build/latest"
37+
]
38+
}
39+
}
40+
},
41+
"name": "cuda12.9-llvm18"
42+
}

‎.devcontainer/devcontainer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:24.12-cpp-gcc13-cuda12.6-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.10-cpp-gcc13-cuda12.9-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},
@@ -14,8 +14,8 @@
1414
"SCCACHE_BUCKET": "rapids-sccache-devs",
1515
"AWS_ROLE_ARN": "arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs",
1616
"HISTFILE": "${containerWorkspaceFolder}/.cache/._bash_history",
17-
"DEVCONTAINER_NAME": "cuda12.6-gcc13",
18-
"CUCO_CUDA_VERSION": "12.6",
17+
"DEVCONTAINER_NAME": "cuda12.9-gcc13",
18+
"CUCO_CUDA_VERSION": "12.9",
1919
"CUCO_HOST_COMPILER": "gcc",
2020
"CUCO_HOST_COMPILER_VERSION": "13"
2121
},
@@ -38,5 +38,5 @@
3838
}
3939
}
4040
},
41-
"name": "cuda12.6-gcc13"
41+
"name": "cuda12.9-gcc13"
4242
}

‎.github/workflows/dispatch-build-and-test.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
1+
# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,8 +23,7 @@ on:
2323

2424
jobs:
2525
# Using a matrix to dispatch to the build-and-test reusable workflow for each build configuration
26-
# ensures that the build/test steps can overlap across different configurations. For example,
27-
# the build step for CUDA 12.1 + gcc 9.3 can run at the same time as the test step for CUDA 11.0 + clang 11.
26+
# ensures that the build/test steps can overlap across different configurations.
2827
build_and_test:
2928
name: ${{matrix.cpu}}
3029
uses: ./.github/workflows/build-and-test.yml

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ci:
1010

1111
repos:
1212
- repo: https://github.com/pre-commit/mirrors-clang-format
13-
rev: v18.1.8
13+
rev: v20.1.4
1414
hooks:
1515
- id: clang-format
1616
types_or: [c, c++, cuda]

‎CMakeLists.txt‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=============================================================================
2-
# Copyright (c) 2018-2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2018-2025, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
1515
#=============================================================================
1616
cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
1717

18+
set(rapids-cmake-version 25.10)
1819
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
19-
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.10/RAPIDS.cmake
20+
file(DOWNLOAD
21+
https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${rapids-cmake-version}/RAPIDS.cmake
2022
${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
2123
endif()
2224
include(${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
@@ -86,6 +88,12 @@ target_include_directories(cuco INTERFACE
8688
target_link_libraries(cuco INTERFACE CCCL::CCCL CUDA::toolkit)
8789
target_compile_features(cuco INTERFACE cxx_std_17 cuda_std_17)
8890

91+
###################################################################################################
92+
# - Optionally download RoaringFormatSpec test data -----------------------------------------------
93+
94+
option(CUCO_DOWNLOAD_ROARING_TESTDATA "Download RoaringFormatSpec test data" ON)
95+
include(${CMAKE_CURRENT_LIST_DIR}/cmake/roaring_testdata.cmake)
96+
8997
###################################################################################################
9098
# - optionally build tests ------------------------------------------------------------------------
9199

@@ -94,9 +102,13 @@ if(BUILD_TESTS)
94102
endif(BUILD_TESTS)
95103

96104
###################################################################################################
97-
# - Optionally build google benchmarks ------------------------------------------------------------
105+
# - Optionally build nvbench benchmarks -----------------------------------------------------------
98106

99107
if(BUILD_BENCHMARKS)
108+
include(${rapids-cmake-dir}/cpm/nvbench.cmake)
109+
include(${rapids-cmake-dir}/cpm/package_override.cmake)
110+
rapids_cpm_nvbench(BUILD_STATIC)
111+
100112
add_subdirectory(benchmarks)
101113
endif(BUILD_BENCHMARKS)
102114

0 commit comments

Comments
 (0)