Skip to content

Commit

Permalink
Correct re-root controls from conda-forge with thrust/cub/etc (#431)
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmaynard authored Jun 29, 2023
1 parent 6f59951 commit 052d184
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 1 deletion.
47 changes: 47 additions & 0 deletions rapids-cmake/cpm/patches/Thrust/reroot_support.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
diff --git a/dependencies/cub/cub/cmake/cub-header-search.cmake b/dependencies/cub/cub/cmake/cub-header-search.cmake
index 2ff1a8acd8..5e731f2be8 100644
--- a/dependencies/cub/cub/cmake/cub-header-search.cmake
+++ b/dependencies/cub/cub/cmake/cub-header-search.cmake
@@ -1,5 +1,6 @@
unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh
+ NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH # Only search explicit paths below:
PATHS
"${CMAKE_CURRENT_LIST_DIR}/../.." # Source tree
diff --git a/dependencies/cub/cub/cmake/cub-header-search.cmake.in b/dependencies/cub/cub/cmake/cub-header-search.cmake.in
index 271b1b27bd..3bd10e4b70 100644
--- a/dependencies/cub/cub/cmake/cub-header-search.cmake.in
+++ b/dependencies/cub/cub/cmake/cub-header-search.cmake.in
@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../")
list(JOIN from_install_prefix "" from_install_prefix)

find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh
+ NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH # Only search explicit paths below:
PATHS
"${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
diff --git a/thrust/cmake/thrust-header-search.cmake b/thrust/cmake/thrust-header-search.cmake
index 643ec90b7..7d27c68f4 100644
--- a/thrust/cmake/thrust-header-search.cmake
+++ b/thrust/cmake/thrust-header-search.cmake
@@ -1,6 +1,7 @@
# Parse version information from version.h:
unset(_THRUST_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h
+ NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH # Only search explicit paths below:
PATHS
"${CMAKE_CURRENT_LIST_DIR}/../.." # Source tree
diff --git a/thrust/cmake/thrust-header-search.cmake.in b/thrust/cmake/thrust-header-search.cmake.in
index c014c469b..adea07e2d 100644
--- a/thrust/cmake/thrust-header-search.cmake.in
+++ b/thrust/cmake/thrust-header-search.cmake.in
@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../")
list(JOIN from_install_prefix "" from_install_prefix)

find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h
+ NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH # Only search explicit paths below:
PATHS
"${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
12 changes: 12 additions & 0 deletions rapids-cmake/cpm/patches/libcudacxx/reroot_support.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
index 8c44d990..365b9de0 100644
--- a/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
+++ b/lib/cmake/libcudacxx/libcudacxx-header-search.cmake.in
@@ -11,6 +11,7 @@ list(TRANSFORM from_install_prefix REPLACE ".+" "../")
list(JOIN from_install_prefix "" from_install_prefix)

find_path(_libcudacxx_VERSION_INCLUDE_DIR cuda/std/detail/__config
+ NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search
NO_DEFAULT_PATH # Only search explicit paths below:
PATHS
"${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
12 changes: 11 additions & 1 deletion rapids-cmake/cpm/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
"file" : "libcudacxx/install_rules.diff",
"issue" : "libcudacxx 1.X installs incorrect files [https://github.com/NVIDIA/libcudacxx/pull/428]",
"fixed_in" : "2.2"
}
},
{
"file" : "libcudacxx/reroot_support.diff",
"issue" : "Support conda-forge usage of CMake rerooting [https://github.com/NVIDIA/libcudacxx/pull/490]",
"fixed_in" : "2.2"
},
]
},
"nvbench" : {
Expand Down Expand Up @@ -71,6 +76,11 @@
"git_url" : "https://github.com/NVIDIA/thrust.git",
"git_tag" : "${version}",
"patches" : [
{
"file" : "Thrust/reroot_support.diff",
"issue" : "Support conda-forge usage of CMake rerooting [https://github.com/NVIDIA/thrust/pull/1969]",
"fixed_in" : "2.2"
},
{
"file" : "Thrust/transform_iter_with_reduce_by_key.diff",
"issue" : "Support transform iterator with reduce by key [https://github.com/NVIDIA/thrust/pull/1805]",
Expand Down

0 comments on commit 052d184

Please sign in to comment.