Skip to content

Commit a431dbe

Browse files
authored
Find RMM before CCCL (#20336)
Since #18235, cudf has not needed CCCL patches. However, that change missed reordering the `get_XXX` includes, so we have still always been cloning and using a separate CCCL version. Fix that by reordering. We also move the search for RMM before searching for NVTX since an RMM build can also supply that. Authors: - Lawrence Mitchell (https://github.com/wence-) - Bradley Dice (https://github.com/bdice) Approvers: - Bradley Dice (https://github.com/bdice) URL: #20336
1 parent 6eb3b9c commit a431dbe

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cpp/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,10 @@ include(cmake/thirdparty/get_nvtx.cmake)
279279
# find nvCOMP
280280
include(cmake/thirdparty/get_nvcomp.cmake)
281281

282-
# find CCCL before rmm so that we get cudf's patched version of CCCL
282+
# find CCCL
283283
include(cmake/thirdparty/get_cccl.cmake)
284284

285-
# find rmm
285+
# find rmm, should come after including CCCL to allow overriding the CCCL version used for testing
286286
include(cmake/thirdparty/get_rmm.cmake)
287287

288288
# find croaring

0 commit comments

Comments
 (0)