Skip to content

Use C++20 standard #749

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 16 commits into from
Jul 25, 2025
Merged

Use C++20 standard #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7292970
Upgrade to c++20
kingcrimsontianyu Jun 5, 2025
e97d994
Fix a test UB resulting from incorrect initialization
kingcrimsontianyu Jun 9, 2025
36e06ea
Merge branch 'fix-test-ub' into cpp-20
kingcrimsontianyu Jun 9, 2025
6c312fa
Merge branch 'branch-25.08' into cpp-20
kingcrimsontianyu Jun 25, 2025
8407d6e
Clean-up
kingcrimsontianyu Jun 25, 2025
e3f0eab
Remove cxx extensions from cmake
kingcrimsontianyu Jun 25, 2025
ef5a3e5
Merge branch 'branch-25.08' into cpp-20
kingcrimsontianyu Jul 18, 2025
d1c3478
Fix CI build error
kingcrimsontianyu Jul 18, 2025
0638d48
Use an alternative method to solve CI error
kingcrimsontianyu Jul 18, 2025
47ab234
Fix
kingcrimsontianyu Jul 18, 2025
a65c99b
Merge branch 'branch-25.08' into cpp-20
kingcrimsontianyu Jul 18, 2025
89dda27
Update
kingcrimsontianyu Jul 21, 2025
95ed017
Update
kingcrimsontianyu Jul 21, 2025
129bf35
Update conda/recipes/libkvikio/conda_build_config.yaml
vyasr Jul 25, 2025
023450c
Merge branch 'branch-25.10' into cpp-20
vyasr Jul 25, 2025
616b432
Disable module scanning
vyasr Jul 25, 2025
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
5 changes: 5 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ project(
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")

# For now, disable CMake's automatic module scanning for C++ files. There is an sccache bug in the
# version RAPIDS uses in CI that causes it to handle the resulting -M* flags incorrectly with
# gcc>=14. We can remove this once we upgrade to a newer sccache version.
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)

# Write the version header
rapids_cmake_write_version_file(include/kvikio/version_config.hpp)

Expand Down
9 changes: 8 additions & 1 deletion cpp/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ function(kvikio_add_benchmark)
endif()

add_executable(${_KVIKIO_NAME} ${_KVIKIO_SOURCES})
set_target_properties(${_KVIKIO_NAME} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib")
set_target_properties(
${_KVIKIO_NAME}
PROPERTIES INSTALL_RPATH "\$ORIGIN/../../../lib"
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
CUDA_STANDARD 20
CUDA_STANDARD_REQUIRED ON
)

target_link_libraries(${_KVIKIO_NAME} PUBLIC benchmark::benchmark kvikio::kvikio)

Expand Down
6 changes: 2 additions & 4 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@ function(kvikio_add_test)
set_target_properties(
${_KVIKIO_NAME}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "$<BUILD_INTERFACE:${KvikIO_BINARY_DIR}/gtests>"
CXX_STANDARD 17
CXX_STANDARD 20
CXX_STANDARD_REQUIRED ON
# For std:: support of __int128_t. Can be removed once using cuda::std
CXX_EXTENSIONS ON
CUDA_STANDARD 17
CUDA_STANDARD 20
CUDA_STANDARD_REQUIRED ON
)
target_link_libraries(
Expand Down