Merge branch 'branch-25.02' into use-cuda-python

rapidsai · Dec 20, 2024 · 8400d39 · 8400d39
2 parents 209ed58 + 3fdaba6
commit 8400d39
Show file tree

Hide file tree

Showing 10 changed files with 140 additions and 87 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -180,16 +180,11 @@ jobs:
         build-all --verbose -j$(nproc --ignore=1) -DBUILD_CUGRAPH_MG_TESTS=ON;
         sccache -s;
   telemetry-summarize:
-    runs-on: ubuntu-latest
+    # This job must use a self-hosted runner to record telemetry traces.
+    runs-on: linux-amd64-cpu4
     needs: pr-builder
     if: ${{ vars.TELEMETRY_ENABLED == 'true' && !cancelled() }}
     continue-on-error: true
     steps:
-      - name: Load stashed telemetry env vars
-        uses: rapidsai/shared-actions/telemetry-dispatch-load-base-env-vars@main
-        with:
-            load_service_name: true
       - name: Telemetry summarize
-        uses: rapidsai/shared-actions/telemetry-dispatch-write-summary@main
-        with:
-          cert_concat: "${{ secrets.OTEL_EXPORTER_OTLP_CA_CERTIFICATE }};${{ secrets.OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE }};${{ secrets.OTEL_EXPORTER_OTLP_CLIENT_KEY }}"
+        uses: rapidsai/shared-actions/telemetry-dispatch-summarize@main
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -63,6 +63,8 @@ rapids-logger "Build CPP docs"
 pushd cpp/doxygen
 doxygen Doxyfile
 export XML_DIR_LIBCUGRAPH="$(pwd)/xml"
+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"

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
@@ -13,6 +13,7 @@ dependencies:
 - certifi
 - cmake>=3.26.4,!=3.30.0
 - cuda-nvtx
+- cuda-python>=11.8.5,<12.0a0
 - cuda-version=11.8
 - cudatoolkit
 - cudf==25.2.*,>=0.0.0a0
@@ -27,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
@@ -67,11 +67,10 @@ dependencies:
 - 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
@@ -16,6 +16,7 @@ dependencies:
 - cuda-nvcc
 - cuda-nvtx-dev
 - cuda-profiler-api
+- cuda-python>=12.6.2,<13.0a0
 - cuda-version=12.5
 - cudf==25.2.*,>=0.0.0a0
 - cupy>=12.0.0
@@ -33,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
@@ -72,11 +72,10 @@ dependencies:
 - 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