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 libcudacxx patch needed for nvcc 11.4 #10057

Merged
merged 8 commits into from
Jan 20, 2022
Merged

Remove libcudacxx patch needed for nvcc 11.4 #10057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6176c4e
Remove libcudacxx patch needed for nvcc 11.4
robertmaynard Jan 14, 2022
0867ad6
correct style issue found by ci
robertmaynard Jan 14, 2022
459736c
Merge branch 'branch-22.02' into fea/remove_libcudacxx_cuda11.4_patch
robertmaynard Jan 18, 2022
f3c0a31
Move cuCollections forward to point it uses 1.7
robertmaynard Jan 18, 2022
f848fdb
Merge branch 'branch-22.02' into fea/remove_libcudacxx_cuda11.4_patch
robertmaynard Jan 18, 2022
f2d3c18
Merge branch 'branch-22.02' into fea/remove_libcudacxx_cuda11.4_patch
robertmaynard Jan 19, 2022
991a9f9
Merge branch 'branch-22.02' into fea/remove_libcudacxx_cuda11.4_patch
robertmaynard Jan 19, 2022
13ee506
Merge branch 'branch-22.02' into fea/remove_libcudacxx_cuda11.4_patch
robertmaynard Jan 20, 2022
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
21 changes: 0 additions & 21 deletions cpp/cmake/libcudacxx.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cpp/cmake/thirdparty/get_cucollections.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function(find_and_configure_cucollections)
cuco 0.0
GLOBAL_TARGETS cuco::cuco
CPM_ARGS GITHUB_REPOSITORY NVIDIA/cuCollections
GIT_TAG 193de1aa74f5721717f991ca757dc610c852bb17
GIT_TAG 0ca860b824f5dc22cf8a41f09912e62e11f07d82
OPTIONS "BUILD_TESTS OFF" "BUILD_BENCHMARKS OFF" "BUILD_EXAMPLES OFF"
)

Expand Down
6 changes: 1 addition & 5 deletions cpp/cmake/thirdparty/get_libcudacxx.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@
function(find_and_configure_libcudacxx)
include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)

rapids_cpm_libcudacxx(
BUILD_EXPORT_SET cudf-exports
INSTALL_EXPORT_SET cudf-exports PATCH_COMMAND patch --reject-file=- -p1 -N <
${CUDF_SOURCE_DIR}/cmake/libcudacxx.patch || true
)
rapids_cpm_libcudacxx(BUILD_EXPORT_SET cudf-exports INSTALL_EXPORT_SET cudf-exports)

set(LIBCUDACXX_INCLUDE_DIR
"${libcudacxx_SOURCE_DIR}/include"
Expand Down