Merge branch 'branch-25.02' into b25.02-add-amazon-dataset

.devcontainer/Dockerfile

@@ -6,6 +6,7 @@ ARG PYTHON_PACKAGE_MANAGER=conda
 FROM ${BASE} as pip-base
 
 ENV DEFAULT_VIRTUAL_ENV=rapids
+ENV RAPIDS_LIBUCX_PREFER_SYSTEM_LIBRARY=true
 
 RUN apt update -y \
  && DEBIAN_FRONTEND=noninteractive apt install -y \

.devcontainer/cuda11.8-pip/devcontainer.json

@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.15.0-openmpi-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:25.02-cpp-cuda11.8-ucx1.17.0-openmpi-ubuntu22.04"
     }
   },
   "runArgs": [

.github/workflows/pr.yaml

@@ -49,7 +49,7 @@ jobs:
       files_yaml: |
         test_cpp:
           - '**'
-          - '!.devcontainers/**'
+          - '!.devcontainer/**'
           - '!CONTRIBUTING.md'
           - '!README.md'
           - '!docs/**'
@@ -60,13 +60,13 @@ jobs:
           - '!readme_pages/**'
         test_notebooks:
           - '**'
-          - '!.devcontainers/**'
+          - '!.devcontainer/**'
           - '!CONTRIBUTING.md'
           - '!README.md'
           - '!docs/**'
         test_python:
           - '**'
-          - '!.devcontainers/**'
+          - '!.devcontainer/**'
           - '!CONTRIBUTING.md'
           - '!README.md'
           - '!docs/**'

build.sh

@@ -331,17 +331,17 @@ if hasArg docs || hasArg all; then
               ${CMAKE_VERBOSE_OPTION}
     fi
 
-    for PROJECT in libcugraphops libwholegraph; do
-        XML_DIR="${REPODIR}/docs/cugraph/${PROJECT}"
-        rm -rf "${XML_DIR}"
-        mkdir -p "${XML_DIR}"
-        export XML_DIR_${PROJECT^^}="$XML_DIR"
-
-        echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}"
-        curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
-        tar -xzf xml.tar.gz -C "${XML_DIR}"
-        rm "./xml.tar.gz"
-    done
+    # for PROJECT in libwholegraph; do
+    #     XML_DIR="${REPODIR}/docs/cugraph/${PROJECT}"
+    #     rm -rf "${XML_DIR}"
+    #     mkdir -p "${XML_DIR}"
+    #     export XML_DIR_${PROJECT^^}="$XML_DIR"
+
+    #     echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}"
+    #     curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
+    #     tar -xzf xml.tar.gz -C "${XML_DIR}"
+    #     rm "./xml.tar.gz"
+    # done
 
     cd ${LIBCUGRAPH_BUILD_DIR}
     cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target docs_cugraph ${VERBOSE_FLAG}

ci/build_docs.sh

@@ -46,19 +46,18 @@ rapids-mamba-retry install \
   "cugraph-service-server=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
   "cugraph-service-client=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
   "libcugraph_etl=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
-  "pylibcugraphops=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
   "pylibwholegraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
   'pytorch>=2.3' \
   "cuda-version=${CONDA_CUDA_VERSION}"
 
 export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
-for PROJECT in libcugraphops 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
+# 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

cpp/CMakeLists.txt

@@ -488,6 +488,7 @@ target_link_libraries(cugraph
     PRIVATE
         ${COMPILED_RAFT_LIB}
         cuco::cuco
+        rmm::rmm_logger_impl
     )
 
 ################################################################################

docs/cugraph/source/api_docs/index.rst

@@ -24,8 +24,7 @@ Graph Neural Networks API Documentation
 
     cugraph-dgl/cugraph_dgl.rst
     cugraph-pyg/cugraph_pyg.rst
-    cugraph-ops/index.rst
-    wholegraph/index.rst
+    .. wholegraph/index.rst
 
 Additional Graph Packages API Documentation
 ----------------------------------

docs/cugraph/source/conf.py

@@ -222,8 +222,7 @@ def setup(app):
 
 breathe_projects = {
     'libcugraph': os.environ['XML_DIR_LIBCUGRAPH'],
-    'libcugraphops': os.environ['XML_DIR_LIBCUGRAPHOPS'],
-    'libwholegraph': os.environ['XML_DIR_LIBWHOLEGRAPH']
+    # 'libwholegraph': os.environ['XML_DIR_LIBWHOLEGRAPH']
 }
 
 breathe_default_project = "libcugraph"