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.

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

cudf now leverages rapids-cmake to reduce CMake boilerplate #9030

Merged

Conversation

robertmaynard
Copy link
Contributor

rapids-cmake providies features such as dependency tracking, pre-configured CPM dependencies, and CUDA architecture detction.

Using those features allows cudf to reduce the amount of CMake
code it needs to maintain, and brings it inline with the rest
of RAPIDS.

@robertmaynard robertmaynard added 2 - In Progress Currently a work in progress CMake CMake build issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Aug 12, 2021
@github-actions github-actions bot added the libcudf Affects libcudf (C++/CUDA) code. label Aug 12, 2021
@robertmaynard robertmaynard force-pushed the fea/cudf_use_rapids_cmake branch from 43940bc to 3d503ca Compare August 12, 2021 21:22
@robertmaynard
Copy link
Contributor Author

rerun tests

@codecov
Copy link

codecov bot commented Aug 13, 2021

Codecov Report

❗ No coverage uploaded for pull request base (branch-21.10@44bf4ba). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head f080405 differs from pull request most recent head f88962e. Consider uploading reports for the commit f88962e to get more accurate results
Impacted file tree graph

@@               Coverage Diff               @@
##             branch-21.10    #9030   +/-   ##
===============================================
  Coverage                ?   10.76%           
===============================================
  Files                   ?      114           
  Lines                   ?    19085           
  Branches                ?        0           
===============================================
  Hits                    ?     2054           
  Misses                  ?    17031           
  Partials                ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 44bf4ba...f88962e. Read the comment docs.

@github-actions github-actions bot added the Java Affects Java cuDF API. label Aug 13, 2021
@robertmaynard robertmaynard force-pushed the fea/cudf_use_rapids_cmake branch 2 times, most recently from 095cfb3 to 40f160d Compare August 16, 2021 13:53
@robertmaynard
Copy link
Contributor Author

rerun tests

1 similar comment
@robertmaynard
Copy link
Contributor Author

rerun tests

@robertmaynard robertmaynard force-pushed the fea/cudf_use_rapids_cmake branch 4 times, most recently from 25a34e9 to 708799e Compare August 18, 2021 20:58
@robertmaynard robertmaynard marked this pull request as ready for review August 19, 2021 12:25
@robertmaynard robertmaynard requested review from a team as code owners August 19, 2021 12:25
rapids-cmake providies features such as dependency tracking,
pre-configured CPM dependencies, and CUDA architecture detction.

Using those features allows cudf to reduce the amount of CMake
code it needs to mantain, and brings it inline with the rest
of RAPIDS.
@robertmaynard robertmaynard force-pushed the fea/cudf_use_rapids_cmake branch from 708799e to ebe60c0 Compare August 19, 2021 12:36
@robertmaynard
Copy link
Contributor Author

rerun tests

Copy link
Member

@jlowe jlowe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems OK from the Java perspective. Was able to build this in the Docker container used for publishing cudf Java jar snapshots.

@devavret
Copy link
Contributor

I don't believe my review is needed.

Copy link
Member

@harrism harrism left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Just a few copyrights need to be updated.

cpp/cmake/thirdparty/get_libcudacxx.cmake Show resolved Hide resolved
cpp/libcudf_kafka/CMakeLists.txt Show resolved Hide resolved
@hyperbolic2346
Copy link
Contributor

I don't feel that I can review this well.

@robertmaynard robertmaynard requested a review from harrism August 24, 2021 12:46
@robertmaynard
Copy link
Contributor Author

rerun tests

@robertmaynard robertmaynard added 3 - Ready for Review Ready for review by team 0 - Waiting on Author Waiting for author to respond to review and removed 2 - In Progress Currently a work in progress 3 - Ready for Review Ready for review by team labels Aug 25, 2021
@robertmaynard
Copy link
Contributor Author

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 8a3efd0 into rapidsai:branch-21.10 Aug 31, 2021
@robertmaynard robertmaynard deleted the fea/cudf_use_rapids_cmake branch August 31, 2021 11:54
Comment on lines -234 to -246
include_directories("${THRUST_INCLUDE}"
"${CUB_INCLUDE}"
"${LIBCUDACXX_INCLUDE}"
"${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}"
"${NVCOMP_INCLUDE_DIR}"
"${CMAKE_BINARY_DIR}/include"
"${CMAKE_SOURCE_DIR}/include"
"${SPDLOG_INCLUDE}"
"${CMAKE_SOURCE_DIR}/src"
"${JNI_INCLUDE_DIRS}"
"${CUDF_INCLUDE}"
"${RMM_INCLUDE}"
"${ARROW_INCLUDE}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removing this part breaks cufilejni build #9167
submitted a fix at #9168

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing that regression, sorry I introduced it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no worries, thanks

rapids-bot bot pushed a commit that referenced this pull request Sep 17, 2021
When #9030 was merged it incorrectly resolved `get_cucollections.cmake` to use features of `rapids_cpm_find` but still call `CPMFindPackage`. This corrects the issues by properly calling `rapids_cpm_find`.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Keith Kraus (https://github.com/kkraus14)
  - Mark Harris (https://github.com/harrism)

URL: #9189
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 - Waiting on Author Waiting for author to respond to review CMake CMake build issue improvement Improvement / enhancement to an existing function Java Affects Java cuDF API. libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants