Skip to content

Commit 251b848

Browse files
PointKernelPointKernel
authored
Update rapids-cmake version to 25.12 (#765)
This PR updates the `rapids-cmake` version to 25.12
1 parent d36905c commit 251b848

Some content is hidden

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

43 files changed

+20
-104
lines changed

‎.devcontainer/cuda12.0-gcc11/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:25.10-cpp-gcc11-cuda12.0-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.12-cpp-gcc11-cuda12.0-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},

‎.devcontainer/cuda12.0-llvm14/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:25.10-cpp-llvm14-cuda12.0-ubuntu20.04",
3+
"image": "rapidsai/devcontainers:25.12-cpp-llvm14-cuda12.0-ubuntu20.04",
44
"hostRequirements": {
55
"gpu": true
66
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:25.10-cpp-gcc13-cuda12.9-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.12-cpp-gcc13-cuda12.9-ubuntu24.04",
44
"hostRequirements": {
55
"gpu": true
66
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:25.10-cpp-llvm18-cuda12.9-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.12-cpp-llvm18-cuda12.9-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"shutdownAction": "stopContainer",
3-
"image": "rapidsai/devcontainers:25.10-cpp-gcc13-cuda12.9-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.12-cpp-gcc13-cuda12.9-ubuntu24.04",
44
"hostRequirements": {
55
"gpu": true
66
},

‎.devcontainer/make_devcontainers.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,6 +84,9 @@ while [[ $# -gt 0 ]]; do
8484
shift
8585
done
8686

87+
# IMPORTANT: The matrix file is located in a separate directory (ci/matrix.yml)
88+
# When updating CUDA versions, compiler versions, or Rapids devcontainer versions,
89+
# remember to update the matrix file at: ../ci/matrix.yml
8790
MATRIX_FILE="../ci/matrix.yml"
8891

8992
# Enable verbose mode if requested

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#=============================================================================
1616
cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
1717

18-
set(rapids-cmake-version 25.10)
18+
set(rapids-cmake-version 25.12)
1919
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
2020
file(DOWNLOAD
2121
https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${rapids-cmake-version}/RAPIDS.cmake

‎benchmarks/benchmark_defaults.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ auto constexpr N = 100'000'000;
3838
auto constexpr OCCUPANCY = 0.5;
3939
auto constexpr MULTIPLICITY = 1;
4040
auto constexpr MATCHING_RATE = 1.0;
41-
auto constexpr MAX_NOISE = 3;
4241
auto constexpr SKEW = 0.5;
4342
auto constexpr BATCH_SIZE = 1'000'000;
4443
auto constexpr INITIAL_SIZE = 50'000'000;

‎benchmarks/bloom_filter/add_bench.cu‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ NVBENCH_BENCH_TYPES(bloom_filter_add,
132132
nvbench::type_list<distribution::unique>))
133133
.set_name("bloom_filter_add_unique_size")
134134
.set_type_axes_names({"Key", "Hash", "Word", "WordsPerBlock", "Distribution"})
135-
.set_max_noise(defaults::MAX_NOISE)
136135
.add_int64_axis("NumInputs", {defaults::BF_N})
137136
.add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE);
138137

@@ -144,7 +143,6 @@ NVBENCH_BENCH_TYPES(bloom_filter_add,
144143
nvbench::type_list<distribution::unique>))
145144
.set_name("bloom_filter_add_unique_hash")
146145
.set_type_axes_names({"Key", "Hash", "Word", "WordsPerBlock", "Distribution"})
147-
.set_max_noise(defaults::MAX_NOISE)
148146
.add_int64_axis("NumInputs", {defaults::BF_N})
149147
.add_int64_axis("FilterSizeMB", {defaults::BF_SIZE_MB});
150148

@@ -156,7 +154,6 @@ NVBENCH_BENCH_TYPES(bloom_filter_add,
156154
nvbench::type_list<distribution::unique>))
157155
.set_name("bloom_filter_add_unique_block_dim")
158156
.set_type_axes_names({"Key", "Hash", "Word", "WordsPerBlock", "Distribution"})
159-
.set_max_noise(defaults::MAX_NOISE)
160157
.add_int64_axis("NumInputs", {defaults::BF_N})
161158
.add_int64_axis("FilterSizeMB", {defaults::BF_SIZE_MB});
162159

@@ -165,6 +162,5 @@ NVBENCH_BENCH_TYPES(arrow_bloom_filter_add,
165162
nvbench::type_list<distribution::unique>))
166163
.set_name("arrow_bloom_filter_add_unique_size")
167164
.set_type_axes_names({"Key", "Distribution"})
168-
.set_max_noise(defaults::MAX_NOISE)
169165
.add_int64_axis("NumInputs", {defaults::BF_N})
170166
.add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE);

‎benchmarks/bloom_filter/contains_bench.cu‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ NVBENCH_BENCH_TYPES(bloom_filter_contains,
146146
nvbench::type_list<distribution::unique>))
147147
.set_name("bloom_filter_contains_unique_size")
148148
.set_type_axes_names({"Key", "Hash", "Word", "WordsPerBlock", "Distribution"})
149-
.set_max_noise(defaults::MAX_NOISE)
150149
.add_int64_axis("NumInputs", {defaults::BF_N})
151150
.add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE);
152151

@@ -158,7 +157,6 @@ NVBENCH_BENCH_TYPES(bloom_filter_contains,
158157
nvbench::type_list<distribution::unique>))
159158
.set_name("bloom_filter_contains_unique_hash")
160159
.set_type_axes_names({"Key", "Hash", "Word", "WordsPerBlock", "Distribution"})
161-
.set_max_noise(defaults::MAX_NOISE)
162160
.add_int64_axis("NumInputs", {defaults::BF_N})
163161
.add_int64_axis("FilterSizeMB", {defaults::BF_SIZE_MB});
164162

@@ -170,7 +168,6 @@ NVBENCH_BENCH_TYPES(bloom_filter_contains,
170168
nvbench::type_list<distribution::unique>))
171169
.set_name("bloom_filter_contains_unique_block_dim")
172170
.set_type_axes_names({"Key", "Hash", "Word", "WordsPerBlock", "Distribution"})
173-
.set_max_noise(defaults::MAX_NOISE)
174171
.add_int64_axis("NumInputs", {defaults::BF_N})
175172
.add_int64_axis("FilterSizeMB", {defaults::BF_SIZE_MB});
176173

@@ -179,6 +176,5 @@ NVBENCH_BENCH_TYPES(arrow_bloom_filter_contains,
179176
nvbench::type_list<distribution::unique>))
180177
.set_name("arrow_bloom_filter_contains_unique_size")
181178
.set_type_axes_names({"Key", "Distribution"})
182-
.set_max_noise(defaults::MAX_NOISE)
183179
.add_int64_axis("NumInputs", {defaults::BF_N})
184180
.add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE);

0 commit comments

Comments
 (0)