Merge branch 'branch-25.02' into libcugraph-wheel

rapidsai · Jan 2, 2025 · 740c3e9 · 740c3e9
2 parents 1847314 + dd34c15
commit 740c3e9
Show file tree

Hide file tree

Showing 135 changed files with 12 additions and 4,874 deletions.
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -52,13 +52,6 @@ rapids-mamba-retry install \
 
 export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
-# for PROJECT in libwholegraph; do
-#   rapids-logger "Download ${PROJECT} xml_tar"
-#   TMP_DIR=$(mktemp -d)
-#   export XML_DIR_${PROJECT^^}="$TMP_DIR"
-#   curl "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION_NUMBER}/xml.tar.gz" | tar -xzf - -C "${TMP_DIR}"
-# done
-
 rapids-logger "Build CPP docs"
 pushd cpp/doxygen
 doxygen Doxyfile
@@ -67,14 +60,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/libcugraph/xml_tar"
 tar -czf "${RAPIDS_DOCS_DIR}/libcugraph/xml_tar"/xml.tar.gz -C xml .
 popd
 
-rapids-logger "Build Python docs"
-pushd docs/cugraph
-# Ensure cugraph is importable, since sphinx does not report details about this
-# type of failure well.
-python -c "import cugraph; print(f'Using cugraph: {cugraph}')"
-sphinx-build -b dirhtml source _html
-mkdir -p "${RAPIDS_DOCS_DIR}/cugraph/html"
-mv _html/* "${RAPIDS_DOCS_DIR}/cugraph/html"
-popd
-
 rapids-upload-docs
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -8,6 +8,7 @@ channels:
 - nvidia
 dependencies:
 - aiohttp
+- breathe>=4.35.0
 - c-compiler
 - certifi
 - cmake>=3.26.4,!=3.30.0
@@ -72,6 +73,4 @@ dependencies:
 - ucx-proc=*=gpu
 - ucx-py==0.42.*,>=0.0.0a0
 - wheel
-- pip:
-  - breathe>=4.35.0
 name: all_cuda-118_arch-x86_64
diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml
@@ -8,6 +8,7 @@ channels:
 - nvidia
 dependencies:
 - aiohttp
+- breathe>=4.35.0
 - c-compiler
 - certifi
 - cmake>=3.26.4,!=3.30.0
@@ -77,6 +78,4 @@ dependencies:
 - ucx-proc=*=gpu
 - ucx-py==0.42.*,>=0.0.0a0
 - wheel
-- pip:
-  - breathe>=4.35.0
 name: all_cuda-125_arch-x86_64
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -488,6 +488,7 @@ target_link_libraries(cugraph
         ${COMPILED_RAFT_LIB}
         cuco::cuco
         rmm::rmm_logger_impl
+        raft::raft_logger_impl
     )
 
 ################################################################################

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -169,6 +169,7 @@ function(ConfigureTest CMAKE_TEST_NAME)
             cugraphtestutil
             GTest::gtest
             GTest::gtest_main
+            test_logger_impls
     )
     set_target_properties(
         ${CMAKE_TEST_NAME}
@@ -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}
@@ -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}
@@ -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}
@@ -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 ##################################################################################
 ###################################################################################################

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -368,6 +368,7 @@ dependencies:
     common:
       - output_types: [conda]
         packages:
+          - breathe>=4.35.0
           - doxygen
           - graphviz
           - ipython
@@ -379,9 +380,6 @@ dependencies:
           - sphinx-markdown-tables
           - sphinx
           - sphinxcontrib-websupport
-          - pip:
-            # Need new enough breathe
-            - breathe>=4.35.0
   py_version:
     specific:
       - output_types: [conda]

diff --git a/docs/cugraph/Makefile b/docs/cugraph/Makefile
diff --git a/docs/cugraph/README.md b/docs/cugraph/README.md
diff --git a/docs/cugraph/make.bat b/docs/cugraph/make.bat
diff --git a/docs/cugraph/source/_static/EMPTY b/docs/cugraph/source/_static/EMPTY
diff --git a/docs/cugraph/source/_static/bc_benchmark.png b/docs/cugraph/source/_static/bc_benchmark.png
diff --git a/docs/cugraph/source/_static/colab.png b/docs/cugraph/source/_static/colab.png
diff --git a/docs/cugraph/source/_static/nxcg-execution-diagram.jpg b/docs/cugraph/source/_static/nxcg-execution-diagram.jpg
diff --git a/docs/cugraph/source/_static/references.css b/docs/cugraph/source/_static/references.css
diff --git a/docs/cugraph/source/api_docs/cugraph-dgl/cugraph_dgl.rst b/docs/cugraph/source/api_docs/cugraph-dgl/cugraph_dgl.rst
diff --git a/docs/cugraph/source/api_docs/cugraph-pyg/cugraph_pyg.rst b/docs/cugraph/source/api_docs/cugraph-pyg/cugraph_pyg.rst
diff --git a/docs/cugraph/source/api_docs/cugraph/centrality.rst b/docs/cugraph/source/api_docs/cugraph/centrality.rst