Skip to content

Commit 34e3739

Browse files
authored
Merge branch 'dev' into heterogeneous-lookup-example
2 parents a282dfc + 6d0c28e commit 34e3739

File tree

68 files changed

+1427
-916
lines changed

Some content is hidden

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

68 files changed

+1427
-916
lines changed

.devcontainer/cuda11.8-gcc11/devcontainer.json

Lines changed: 0 additions & 42 deletions
This file was deleted.

.devcontainer/cuda12.8-gcc12/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.06-cpp-gcc12-cuda12.8-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.08-cpp-gcc12-cuda12.8-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},

.devcontainer/cuda12.8-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.06-cpp-gcc13-cuda12.8-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.08-cpp-gcc13-cuda12.8-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.06-cpp-gcc13-cuda12.8-ubuntu22.04",
3+
"image": "rapidsai/devcontainers:25.08-cpp-gcc13-cuda12.8-ubuntu22.04",
44
"hostRequirements": {
55
"gpu": true
66
},

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.06)
18+
set(rapids-cmake-version 25.08)
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

README.md

Lines changed: 11 additions & 9 deletions
Large diffs are not rendered by default.

benchmarks/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ function(ConfigureBench BENCH_NAME)
2727
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/benchmarks")
2828
target_include_directories(${BENCH_NAME} PRIVATE
2929
"${CMAKE_CURRENT_SOURCE_DIR}")
30-
target_compile_options(${BENCH_NAME} PRIVATE --expt-extended-lambda -lineinfo)
30+
target_compile_options(${BENCH_NAME} PRIVATE --compiler-options=-Wall --compiler-options=-Wextra
31+
-Wno-deprecated-gpu-targets --expt-extended-lambda -Xcompiler -Wno-subobject-linkage -lineinfo)
3132
target_link_libraries(${BENCH_NAME} PRIVATE
3233
nvbench::main
3334
pthread

benchmarks/bloom_filter/add_bench.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void bloom_filter_add(nvbench::state& state,
5656
auto const pattern_bits = WordsPerBlock;
5757

5858
try {
59-
auto const policy = policy_type{static_cast<std::uint32_t>(pattern_bits)};
59+
[[maybe_unused]] auto const policy = policy_type{static_cast<uint32_t>(pattern_bits)};
6060
} catch (std::exception const& e) {
6161
state.skip(e.what()); // skip invalid configurations
6262
}

benchmarks/bloom_filter/contains_bench.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void bloom_filter_contains(
6262
auto const pattern_bits = WordsPerBlock;
6363

6464
try {
65-
auto const policy = policy_type{static_cast<uint32_t>(pattern_bits)};
65+
[[maybe_unused]] auto const policy = policy_type{static_cast<uint32_t>(pattern_bits)};
6666
} catch (std::exception const& e) {
6767
state.skip(e.what()); // skip invalid configurations
6868
}

benchmarks/dynamic_map/insert_bench.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023-2024, NVIDIA CORPORATION.
2+
* Copyright (c) 2023-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.
@@ -64,7 +64,7 @@ std::enable_if_t<(sizeof(Key) == sizeof(Value)), void> dynamic_map_insert(
6464
launch.get_stream()};
6565

6666
timer.start();
67-
for (std::size_t i = 0; i < num_keys; i += batch_size) {
67+
for (int64_t i = 0; i < num_keys; i += batch_size) {
6868
map.insert(pairs.begin() + i, pairs.begin() + i + batch_size, {}, {}, launch.get_stream());
6969
}
7070
timer.stop();

0 commit comments

Comments
 (0)