Skip to content
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

Remove Thrust patch in favor of CMake definition for Thrust 32-bit offset types. #17527

Merged
merged 7 commits into from
Dec 10, 2024
Merged

Remove Thrust patch in favor of CMake definition for Thrust 32-bit offset types. #17527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e68817
Remove Thrust patch in favor of CMake definition for Thrust 32-bit of…
bdice Dec 5, 2024
816fc09
Move Thrust offset type definition.
bdice Dec 7, 2024
c6041b3
Merge branch 'branch-25.02' into cccl-set-32-bit-offset-type-with-cmake
bdice Dec 7, 2024
3ae6834
Only use 32 bit definition.
bdice Dec 8, 2024
1f0a381
Update cpp/CMakeLists.txt
vyasr Dec 10, 2024
548ef94
Merge branch 'branch-25.02' into cccl-set-32-bit-offset-type-with-cmake
vyasr Dec 10, 2024
bb9b1d8
Merge branch 'branch-25.02' into cccl-set-32-bit-offset-type-with-cmake
vyasr Dec 10, 2024
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
8 changes: 7 additions & 1 deletion cpp/cmake/thirdparty/get_cccl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2023, NVIDIA CORPORATION.
# Copyright (c) 2023-2024, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand Down Expand Up @@ -36,6 +36,12 @@ function(find_and_configure_cccl)
# Find or install CCCL with our custom set of patches
rapids_cpm_cccl(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports)

# Remove this after upgrading to a CCCL that has a proper CMake option. See
# https://github.com/NVIDIA/cccl/pull/2844
target_compile_definitions(
cudf PRIVATE THRUST_FORCE_64_BIT_OFFSET_TYPE=0 THRUST_FORCE_32_BIT_OFFSET_TYPE=1
)

bdice marked this conversation as resolved.
Show resolved Hide resolved
endfunction()

find_and_configure_cccl()
5 changes: 0 additions & 5 deletions cpp/cmake/thirdparty/patches/cccl_override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
"packages" : {
"CCCL" : {
"patches" : [
{
"file" : "${current_json_dir}/thrust_disable_64bit_dispatching.diff",
"issue" : "Remove 64bit dispatching as not needed by libcudf and results in compiling twice as many kernels [https://github.com/rapidsai/cudf/pull/11437]",
"fixed_in" : ""
},
{
"file" : "${current_json_dir}/thrust_faster_sort_compile_times.diff",
"issue" : "Improve Thrust sort compile times by not unrolling loops for inlined comparators [https://github.com/rapidsai/cudf/pull/10577]",
Expand Down
22 changes: 0 additions & 22 deletions cpp/cmake/thirdparty/patches/thrust_disable_64bit_dispatching.diff
View file
Open in desktop

This file was deleted.

Loading