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 #446

Merged
merged 4 commits into from
Jan 18, 2022
+1 −25
Merged

Remove libcudacxx patch needed for nvcc 11.4 #446

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f56052
Remove libcudacxx patch needed for nvcc 11.4
robertmaynard Jan 18, 2022
7cad11c
Move forward cuco sha1
robertmaynard Jan 18, 2022
058002a
Properly specify install export set for libcudacxx
robertmaynard Jan 18, 2022
6aea4b4
Merge branch 'branch-22.02' into fea/remove_libcudacxx_cuda11.4_patch
robertmaynard Jan 18, 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_cuco.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function(find_and_configure_cuco VERSION)
INSTALL_EXPORT_SET raft-exports
CPM_ARGS
GIT_REPOSITORY https://github.com/NVIDIA/cuCollections.git
GIT_TAG f0eecb203590f1f4ac4a9f1700229f4434ac64dc
GIT_TAG 193de1aa74f5721717f991ca757dc610c852bb17
OPTIONS "BUILD_TESTS OFF"
"BUILD_BENCHMARKS OFF"
"BUILD_EXAMPLES OFF"
Expand Down
5 changes: 1 addition & 4 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,10 +16,7 @@
function(find_and_configure_libcudacxx)
include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)

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

endfunction()

Expand Down