Merge branch 'branch-25.02' into branch-25.02-daskscripts

rapidsai · Jan 3, 2025 · 854d79f · 854d79f
2 parents 5cd70b5 + dd34c15
commit 854d79f
Show file tree

Hide file tree

Showing 139 changed files with 143 additions and 4,957 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/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -58,7 +58,6 @@ DEPENDENCIES=(
   dask-cudf
   libcudf
   libraft
-  libraft-headers
   librmm
   pylibcugraph
   pylibwholegraph

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -8,7 +8,7 @@ channels:
 - nvidia
 dependencies:
 - aiohttp
-- breathe
+- breathe>=4.35.0
 - c-compiler
 - certifi
 - cmake>=3.26.4,!=3.30.0
@@ -28,7 +28,6 @@ dependencies:
 - graphviz
 - ipython
 - libcudf==25.2.*,>=0.0.0a0
-- libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
 - nbsphinx
@@ -64,15 +63,14 @@ dependencies:
 - scikit-learn>=0.23.1
 - scipy
 - setuptools>=61.0.0
+- sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables
-- sphinx<6
 - sphinxcontrib-websupport
-- thriftpy2!=0.5.0,!=0.5.1
+- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
 - torchdata
 - torchmetrics
 - ucx-proc=*=gpu
 - ucx-py==0.42.*,>=0.0.0a0
-- wget
 - wheel
 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,7 +8,7 @@ channels:
 - nvidia
 dependencies:
 - aiohttp
-- breathe
+- breathe>=4.35.0
 - c-compiler
 - certifi
 - cmake>=3.26.4,!=3.30.0
@@ -34,7 +34,6 @@ dependencies:
 - libcurand-dev
 - libcusolver-dev
 - libcusparse-dev
-- libraft-headers==25.2.*,>=0.0.0a0
 - libraft==25.2.*,>=0.0.0a0
 - librmm==25.2.*,>=0.0.0a0
 - nbsphinx
@@ -69,15 +68,14 @@ dependencies:
 - scikit-learn>=0.23.1
 - scipy
 - setuptools>=61.0.0
+- sphinx
 - sphinx-copybutton
 - sphinx-markdown-tables
-- sphinx<6
 - sphinxcontrib-websupport
-- thriftpy2!=0.5.0,!=0.5.1
+- thriftpy2>=0.4.15,!=0.5.0,!=0.5.1
 - torchdata
 - torchmetrics
 - ucx-proc=*=gpu
 - ucx-py==0.42.*,>=0.0.0a0
-- wget
 - wheel
 name: all_cuda-125_arch-x86_64
diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
@@ -70,7 +70,6 @@ requirements:
     - doxygen {{ doxygen_version }}
     - libcudf ={{ minor_version }}
     - libraft ={{ minor_version }}
-    - libraft-headers ={{ minor_version }}
     - librmm ={{ minor_version }}
     - nccl {{ nccl_version }}
     - ucx-proc=*=gpu
@@ -114,7 +113,6 @@ outputs:
         - libcusparse
        {% endif %}
         - libraft ={{ minor_version }}
-        - libraft-headers ={{ minor_version }}
         - librmm ={{ minor_version }}
         - nccl {{ nccl_version }}
         - ucx-proc=*=gpu

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 ##################################################################################
 ###################################################################################################