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

Update for raft logger changes #4835

Open
wants to merge 7 commits into
base: branch-25.02
Choose a base branch
from
Open

Update for raft logger changes #4835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7f1790
Test against raft logger
vyasr Dec 17, 2024
7cad393
Merge branch 'branch-25.02' into feat/raft_logger
vyasr Dec 18, 2024
d603a2a
Add the logger impl to the raft test util
vyasr Dec 18, 2024
43b7074
Merge branch 'feat/raft_logger' of github.com:vyasr/cugraph into feat…
vyasr Dec 18, 2024
d6ef64a
Link the logger impls directly into the tests
vyasr Dec 18, 2024
088b729
Add for all the tests
vyasr Dec 19, 2024
5d3481c
Make sure that the raft logger is linked into libcugraph
vyasr Dec 19, 2024
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
6 changes: 5 additions & 1 deletion ci/build_cpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ rapids-print-env

rapids-logger "Begin cpp build"

RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcugraph
LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2530 cpp)

RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
--channel "${LIBRAFT_CHANNEL}" \
conda/recipes/libcugraph

sccache --show-adv-stats

Expand Down
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ target_link_libraries(cugraph
${COMPILED_RAFT_LIB}
cuco::cuco
rmm::rmm_logger_impl
raft::raft_logger_impl
)

################################################################################
Expand Down
6 changes: 3 additions & 3 deletions cpp/cmake/thirdparty/get_raft.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ endfunction()
# To use a different RAFT locally, set the CMake variable
# CPM_raft_SOURCE=/path/to/local/raft
find_and_configure_raft(VERSION ${CUGRAPH_MIN_VERSION_raft}
FORK rapidsai
PINNED_TAG branch-${CUGRAPH_BRANCH_VERSION_raft}
FORK vyasr
PINNED_TAG feat/logger

# When PINNED_TAG above doesn't match cugraph,
# force local raft clone in build directory
# even if it's already installed.
CLONE_ON_PIN ON
CLONE_ON_PIN OFF
USE_RAFT_STATIC ${USE_RAFT_STATIC}
COMPILE_RAFT_LIB ${CUGRAPH_COMPILE_RAFT_LIB}
)
8 changes: 8 additions & 0 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ function(ConfigureTest CMAKE_TEST_NAME)
cugraphtestutil
GTest::gtest
GTest::gtest_main
test_logger_impls
)
set_target_properties(
${CMAKE_TEST_NAME}
Expand Down Expand Up @@ -199,6 +200,7 @@ function(ConfigureTestMG CMAKE_TEST_NAME)
GTest::gtest_main
NCCL::NCCL
MPI::MPI_CXX
test_logger_impls
)
set_target_properties(
${CMAKE_TEST_NAME}
Expand Down Expand Up @@ -250,6 +252,7 @@ function(ConfigureCTest CMAKE_TEST_NAME)
cugraph_c_testutil
GTest::gtest
GTest::gtest_main
test_logger_impls
)
set_target_properties(
${CMAKE_TEST_NAME}
Expand Down Expand Up @@ -282,6 +285,7 @@ function(ConfigureCTestMG CMAKE_TEST_NAME)
GTest::gtest_main
NCCL::NCCL
MPI::MPI_CXX
test_logger_impls
)
set_target_properties(
${CMAKE_TEST_NAME}
Expand Down Expand Up @@ -310,6 +314,10 @@ function(ConfigureCTestMG CMAKE_TEST_NAME)

endfunction()

add_library(test_logger_impls OBJECT)
target_link_libraries(test_logger_impls PRIVATE raft::raft_logger_impl)


###################################################################################################
### test sources ##################################################################################
###################################################################################################
Expand Down
Loading