-
Notifications
You must be signed in to change notification settings - Fork 922
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.
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
[REVIEW] Use FetchContent to get jitify and libcudacxx #5398
[REVIEW] Use FetchContent to get jitify and libcudacxx #5398
Conversation
Just need to update these lines to fix the Cython errors: https://github.com/rapidsai/cudf/blob/branch-0.15/python/cudf/setup.py#L47-L49 Can remove the thrust / cub lines and then update the path to the |
cpp/benchmarks/CMakeLists.txt
Outdated
"${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}" | ||
"${CMAKE_BINARY_DIR}/include" | ||
"${CMAKE_SOURCE_DIR}/include" | ||
"${CMAKE_SOURCE_DIR}" | ||
"${CMAKE_SOURCE_DIR}/src" | ||
"${CMAKE_SOURCE_DIR}/thirdparty/dlpack/include" | ||
"${CMAKE_SOURCE_DIR}/thirdparty/jitify" | ||
"${CMAKE_SOURCE_DIR}/thirdparty/libcudacxx/include" | ||
"${LIBCUDACXX_INCLUDE_DIR}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May want to move this above the CUDA toolkit includes as well just in case it ships in the toolkit in the future.
Thanks. We can't remove the thrust/cub lines or Cython will build using the Toolkit version of thrust/cub while everything else uses the FetchContent version. I will update the libcudacxx line. |
There's no thrust / Cub types exposed in libcudf APIs that are plumbed into Cython so the headers are unused currently. |
@kkraus14 I was able to remove those but I had to add the following:
This is really dependent on where the user decides to put the libcudf build directory. Is there a way to set the build directory generically? EDIT: going with CUDF_ROOT env variable and falling back to cpp/build if it is not set. |
Codecov Report
@@ Coverage Diff @@
## branch-0.15 #5398 +/- ##
============================================
Coverage 88.63% 88.63%
============================================
Files 57 57
Lines 10769 10769
============================================
Hits 9545 9545
Misses 1224 1224 Continue to review full report at Codecov.
|
Following on #5315, for consistency this PR uses FetchContent to get the source of jitify and libcudacxx rather than using git submodules.
Also updates to use the latest jitify branch (cudf_0.15) to fix CUDA 11 testing issues.
Closes #5369.