Update to CMake 3.20 features, rapids-cmake and CPM
#3844
Conversation
dantegd
added
2 - In Progress
dantegd
changed the title
rapids-cmake and CPM [skip-ci]rapids-cmake and CPM
|
@dantegd Can we make |
| @@ -320,6 +321,7 @@ if(BUILD_CUML_CPP_LIBRARY) | |||
| target_link_libraries(${CUML_CPP_TARGET} | |||
| PUBLIC | |||
| rmm::rmm | |||
| cuml::Thrust | |||
There was a problem hiding this comment.
Thrust targets need some some extra logic to be setup by consumers.
You can see how do this here:
https://github.com/rapidsai/cugraph/pull/1585/files#diff-1bba462ab050e89360fd88110a689e85ee037749cea091a1848ab574381d3795R352
There was a problem hiding this comment.
If that link doesn't work:
set(code_string [=[thrust_create_target(cugraph::Thrust FROM_OPTIONS)]=])
rapids_export(INSTALL cugraph
EXPORT_SET cugraph-exports
GLOBAL_TARGETS cugraph
NAMESPACE cugraph::
DOCUMENTATION doc_string
FINAL_CODE_BLOCK code_string )
There was a problem hiding this comment.
After this change, I'm this error configuring with an RMM source-build dir:
CMake Error at /home/ptaylor/dev/rapids/rmm/cmake/install/FindThrust.cmake:59 (add_library):
add_library cannot create target "thrust_internal" because another target
with the same name already exists. The existing target is an interface
library created in source directory "/home/ptaylor/dev/rapids/cuml/cpp".
See documentation for policy CMP0002 for more details.
There was a problem hiding this comment.
Seems like the above error is fixed by rapidsai/rmm#784
Codecov Report
@@ Coverage Diff @@
## branch-21.06 #3844 +/- ##
===============================================
Coverage ? 85.43%
===============================================
Files ? 226
Lines ? 17281
Branches ? 0
===============================================
Hits ? 14764
Misses ? 2517
Partials ? 0
Flags with carried forward coverage won't be shown. Click here to find out more. Continue to review full report at Codecov.
|
|
rerun tests |
cpp/CMakeLists.txt
Outdated
| @@ -308,7 +308,7 @@ if(BUILD_CUML_CPP_LIBRARY) | |||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> | |||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> | |||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src_prims> | |||
| $<BUILD_INTERFACE:${RAFT_DIR}/cpp/include> | |||
| $<BUILD_INTERFACE:$<$<BOOL:${ENABLE_CUMLPRIMS_MG}>:${cumlprims_mg_INCLUDE_DIRS}>> | |||
| $<BUILD_INTERFACE:$<$<BOOL:${ENABLE_CUMLPRIMS_MG}>:${cumlprims_mg_INCLUDE_DIRS}>> | |||
There was a problem hiding this comment.
We have duplicate lines now adding ${cumlprims_mg_INCLUDE_DIRS}
|
@gpucibot merge |
Depends on rapidsai/raft#187 Based on the work started by @mdemoret-nv on https://github.com/mdemoret-nv/cuml/tree/imp-modernize-cmake with updates for CPM, rapids-cmake and consistency with the equivalent PRs in RAFT and cuGraph Details of changes will be added soon cc @trxcllnt and @robertmaynard for viz Authors: - Dante Gama Dessavre (https://github.com/dantegd) - Michael Demoret (https://github.com/mdemoret-nv) Approvers: - Robert Maynard (https://github.com/robertmaynard) - AJ Schmidt (https://github.com/ajschmidt8) - John Zedlewski (https://github.com/JohnZed) URL: rapidsai#3844
Depends on rapidsai/raft#187
Based on the work started by @mdemoret-nv on https://github.com/mdemoret-nv/cuml/tree/imp-modernize-cmake with updates for CPM, rapids-cmake and consistency with the equivalent PRs in RAFT and cuGraph
Details of changes will be added soon
cc @trxcllnt and @robertmaynard for viz