Skip to content

Switch the remaining C++17 components to C++20 #2063

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 4 commits into from
May 8, 2026
Merged

Switch the remaining C++17 components to C++20 #2063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebac87c
Switch the remaining C++17 components to C++20
achirkin May 6, 2026
ff90d78
Merge branch 'main' into enh-cpp-20
achirkin May 6, 2026
0c5d3ba
Merge branch 'main' into enh-cpp-20
achirkin May 7, 2026
034781d
Merge branch 'main' into enh-cpp-20
achirkin May 7, 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: 4 additions & 0 deletions c/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ function(ConfigureTest)
${TEST_NAME}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<BUILD_INTERFACE:${CUVS_C_BINARY_DIR}/gtests>"
INSTALL_RPATH "\$ORIGIN/../../../${lib_dir}"
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
CUDA_STANDARD 20
CUDA_STANDARD_REQUIRED ON
)

target_include_directories(
Expand Down
19 changes: 8 additions & 11 deletions c/tests/neighbors/ann_mg_c.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down Expand Up @@ -313,18 +313,15 @@ TEST_P(MgCTest, MgCagraTest)
}

// Test parameters that mirror the C++ test cases
const std::vector<mg_test_params> test_inputs = {
INSTANTIATE_TEST_SUITE_P(MgCTests, MgCTest, ::testing::Values(
// IVF-Flat tests
{1000, 5000, 8, 16, MG_MODE_REPLICATED, MG_ALGO_IVF_FLAT, 40, 256, L2Expanded},
{1000, 5000, 8, 16, MG_MODE_SHARDED, MG_ALGO_IVF_FLAT, 40, 256, L2Expanded},
mg_test_params{1000, 5000, 8, 16, MG_MODE_REPLICATED, MG_ALGO_IVF_FLAT, 40, 256, L2Expanded},
mg_test_params{1000, 5000, 8, 16, MG_MODE_SHARDED, MG_ALGO_IVF_FLAT, 40, 256, L2Expanded},

// IVF-PQ tests
{1000, 5000, 8, 16, MG_MODE_REPLICATED, MG_ALGO_IVF_PQ, 40, 256, L2Expanded},
{1000, 5000, 8, 16, MG_MODE_SHARDED, MG_ALGO_IVF_PQ, 40, 256, L2Expanded},
mg_test_params{1000, 5000, 8, 16, MG_MODE_REPLICATED, MG_ALGO_IVF_PQ, 40, 256, L2Expanded},
mg_test_params{1000, 5000, 8, 16, MG_MODE_SHARDED, MG_ALGO_IVF_PQ, 40, 256, L2Expanded},

// CAGRA tests
{1000, 5000, 8, 16, MG_MODE_REPLICATED, MG_ALGO_CAGRA, 40, 256, L2Expanded},
{1000, 5000, 8, 16, MG_MODE_SHARDED, MG_ALGO_CAGRA, 40, 256, L2Expanded},
};

INSTANTIATE_TEST_SUITE_P(MgCTests, MgCTest, ::testing::ValuesIn(test_inputs));
mg_test_params{1000, 5000, 8, 16, MG_MODE_REPLICATED, MG_ALGO_CAGRA, 40, 256, L2Expanded},
mg_test_params{1000, 5000, 8, 16, MG_MODE_SHARDED, MG_ALGO_CAGRA, 40, 256, L2Expanded}));
8 changes: 4 additions & 4 deletions cpp/bench/ann/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ function(ConfigureAnnBench)
set_target_properties(
${BENCH_NAME}
PROPERTIES # 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 Expand Up @@ -390,9 +390,9 @@ if(CUVS_ANN_BENCH_SINGLE_EXE)
set_target_properties(
ANN_BENCH
PROPERTIES # 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
1 change: 0 additions & 1 deletion cpp/bench/ann/src/diskann/diskann_benchmark.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "../common/conf.hpp"
#include "diskann_wrapper.h"

#define JSON_DIAGNOSTICS 1
#include <nlohmann/json.hpp>

#include <algorithm>
Expand Down
Loading