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.

Sign up for GitHub

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

Make cuco a private dependency and leverage rapids-cmake #2432

Merged
merged 10 commits into from
Jul 25, 2022
Merged

Make cuco a private dependency and leverage rapids-cmake #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
049f073
Make cuco a private dependency.
vyasr Jul 19, 2022
9b9c2eb
Use rapids-cmake for downloading cuco.
vyasr Jul 19, 2022
f48955a
Explicitly add private links to cuco for tests that need it due to ac…
vyasr Jul 21, 2022
f08929b
Fix typo.
vyasr Jul 21, 2022
f423ab0
Add one more test.
vyasr Jul 22, 2022
23421e6
Add more tests.
vyasr Jul 22, 2022
b02e046
Fix typo.
vyasr Jul 22, 2022
0f331fe
Add one more test.
vyasr Jul 22, 2022
3311493
Add a couple more tests.
vyasr Jul 22, 2022
45dd98a
Merge remote-tracking branch 'origin/branch-22.08' into build/cuco_pr…
vyasr Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ rapids_cpm_init()

# Putting this before raft to override RAFT from pulling them in.
include(cmake/thirdparty/get_libcudacxx.cmake)
include(cmake/thirdparty/get_cuco.cmake)
include(${rapids-cmake-dir}/cpm/cuco.cmake)
rapids_cpm_cuco(BUILD_EXPORT_SET cugraph-exports)

include(cmake/thirdparty/get_raft.cmake)

Expand Down Expand Up @@ -311,17 +312,17 @@ if (USE_CUGRAPH_OPS)
PUBLIC
cugraph-ops::cugraph-ops++
raft::raft
cuco::cuco
PRIVATE
cuco::cuco
cugraph::cuHornet
NCCL::NCCL
)
else()
target_link_libraries(cugraph
PUBLIC
raft::raft
cuco::cuco
PRIVATE
cuco::cuco
cugraph::cuHornet
NCCL::NCCL
)
Expand Down Expand Up @@ -441,8 +442,8 @@ target_link_libraries(cugraph_c
CUDA::cusolver
CUDA::cusparse
raft::raft
cuco::cuco
PRIVATE
cuco::cuco
cugraph::cugraph
)

Expand Down
34 changes: 0 additions & 34 deletions cpp/cmake/thirdparty/get_cuco.cmake
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ target_link_libraries(cugraphtestutil
PUBLIC
cugraph::cugraph
NCCL::NCCL
PRIVATE
cuco::cuco
)


Expand Down Expand Up @@ -467,6 +469,7 @@ ConfigureTest(RANDOM_WALKS_LOW_LEVEL_TEST sampling/rw_low_level_test.cu)
###########################################################################################
# - MG NBR SAMPLING tests -----------------------------------------------------------------
ConfigureTest(UNIFORM_NEIGHBOR_SAMPLING_TEST sampling/sg_uniform_neighbor_sampling.cu)
target_link_libraries(UNIFORM_NEIGHBOR_SAMPLING_TEST PRIVATE cuco::cuco)

###################################################################################################
# FIXME: since this is technically not a test, consider refactoring the the
Expand Down Expand Up @@ -581,48 +584,59 @@ if(BUILD_CUGRAPH_MG_TESTS)
###########################################################################################
# - MG PRIMS COUNT_IF_V tests -------------------------------------------------------------
ConfigureTestMG(MG_COUNT_IF_V_TEST prims/mg_count_if_v.cu)
target_link_libraries(MG_COUNT_IF_V_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS TRANSFORM_REDUCE_V_FRONTIER_OUTGOING_E_BY_DST tests --------------------------
ConfigureTestMG(MG_TRANSFORM_REDUCE_V_FRONTIER_OUTGOING_E_BY_DST_TEST
prims/mg_transform_reduce_v_frontier_outgoing_e_by_dst.cu)
target_link_libraries(MG_TRANSFORM_REDUCE_V_FRONTIER_OUTGOING_E_BY_DST_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS REDUCE_V tests ---------------------------------------------------------------
ConfigureTestMG(MG_REDUCE_V_TEST prims/mg_reduce_v.cu)
target_link_libraries(MG_REDUCE_V_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS TRANSFORM_REDUCE_V tests -----------------------------------------------------
ConfigureTestMG(MG_TRANSFORM_REDUCE_V_TEST prims/mg_transform_reduce_v.cu)
target_link_libraries(MG_TRANSFORM_REDUCE_V_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS TRANSFORM_REDUCE_E tests -----------------------------------------------------
ConfigureTestMG(MG_TRANSFORM_REDUCE_E_TEST prims/mg_transform_reduce_e.cu)
target_link_libraries(MG_TRANSFORM_REDUCE_E_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS COUNT_IF_E tests -------------------------------------------------------------
ConfigureTestMG(MG_COUNT_IF_E_TEST prims/mg_count_if_e.cu)
target_link_libraries(MG_COUNT_IF_E_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS PER_V_TRANSFORM_REDUCE_INCOMING_OUTGOING_E tests -----------------------------
ConfigureTestMG(MG_PER_V_TRANSFORM_REDUCE_INCOMING_OUTGOING_E_TEST
prims/mg_per_v_transform_reduce_incoming_outgoing_e.cu)
target_link_libraries(MG_PER_V_TRANSFORM_REDUCE_INCOMING_OUTGOING_E_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG PRIMS EXTRACT_IF_E tests -----------------------------------------------------------
ConfigureTestMG(MG_EXTRACT_IF_E_TEST prims/mg_extract_if_e.cu)
target_link_libraries(MG_EXTRACT_IF_E_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG GATHER_UTILS tests -----------------------------------------------------------------
ConfigureTestMG(MG_GATHER_UTILS_TEST sampling/detail/mg_gather_utils.cu)
target_link_libraries(MG_GATHER_UTILS_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG GATHER_ONE_HOP tests ---------------------------------------------------------------
ConfigureTestMG(MG_GATHER_ONE_HOP_TEST sampling/detail/mg_gather_one_hop.cu)
target_link_libraries(MG_GATHER_ONE_HOP_TEST PRIVATE cuco::cuco)

###########################################################################################
# - MG NBR SAMPLING tests -----------------------------------------------------------------
ConfigureTestMG(MG_UNIFORM_NEIGHBOR_SAMPLING_TEST sampling/mg_uniform_neighbor_sampling.cu)
target_link_libraries(MG_UNIFORM_NEIGHBOR_SAMPLING_TEST PRIVATE cuco::cuco)

###########################################################################################
# - RANDOM_WALKS tests --------------------------------------------------------------------
Expand Down