update RAFT pin, remove more TODO comments

rapidsai · Jan 14, 2025 · 86c56d0 · 86c56d0
1 parent 8fe1d33
commit 86c56d0
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 60 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -13,49 +13,50 @@ jobs:
   # Please keep pr-builder as the top job here
   pr-builder:
     needs:
-      #- check-nightly-ci
+      - check-nightly-ci
       - changed-files
       - checks
       - conda-cpp-build
       - conda-cpp-tests
       - conda-cpp-checks
-      # - conda-notebook-tests
+      - conda-notebook-tests
       - conda-python-build
       - conda-python-tests
-      # - docs-build
+      - docs-build
       - wheel-build-libcugraph
       - wheel-build-pylibcugraph
       - wheel-tests-pylibcugraph
       - wheel-build-cugraph
       - wheel-tests-cugraph
-      # - telemetry-setup
+      - telemetry-setup
+      # TODO(jameslamb): restore 'devcontainers' job before merging
       # - devcontainer
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     if: always()
     with:
       needs: ${{ toJSON(needs) }}
-  # telemetry-setup:
-  #   runs-on: ubuntu-latest
-  #   continue-on-error: true
-  #   env:
-  #       OTEL_SERVICE_NAME: "pr-cugraph"
-  #   steps:
-  #     - name: Telemetry setup
-  #       if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
-  #       uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
-  # check-nightly-ci:
-  #   # Switch to ubuntu-latest once it defaults to a version of Ubuntu that
-  #   # provides at least Python 3.11 (see
-  #   # https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat)
-  #   runs-on: ubuntu-24.04
-  #   env:
-  #     RAPIDS_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #     - name: Check if nightly CI is passing
-  #       uses: rapidsai/shared-actions/check_nightly_success/dispatch@main
-  #       with:
-  #         repo: cugraph
+  telemetry-setup:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+        OTEL_SERVICE_NAME: "pr-cugraph"
+    steps:
+      - name: Telemetry setup
+        if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
+        uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
+  check-nightly-ci:
+    # Switch to ubuntu-latest once it defaults to a version of Ubuntu that
+    # provides at least Python 3.11 (see
+    # https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat)
+    runs-on: ubuntu-24.04
+    env:
+      RAPIDS_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Check if nightly CI is passing
+        uses: rapidsai/shared-actions/check_nightly_success/dispatch@main
+        with:
+          repo: cugraph
   changed-files:
     secrets: inherit
     # needs: telemetry-setup
@@ -129,27 +130,27 @@ jobs:
     if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
     with:
       build_type: pull-request
-  # conda-notebook-tests:
-  #   needs: [conda-python-build, changed-files]
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-  #   if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
-  #   with:
-  #     build_type: pull-request
-  #     node_type: "gpu-v100-latest-1"
-  #     arch: "amd64"
-  #     container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
-  #     run_script: "ci/test_notebooks.sh"
-  # docs-build:
-  #   needs: conda-python-build
-  #   secrets: inherit
-  #   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-  #   with:
-  #     build_type: pull-request
-  #     node_type: "gpu-v100-latest-1"
-  #     arch: "amd64"
-  #     container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
-  #     run_script: "ci/build_docs.sh"
+  conda-notebook-tests:
+    needs: [conda-python-build, changed-files]
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
+      run_script: "ci/test_notebooks.sh"
+  docs-build:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:cuda11.8.0-ubuntu22.04-py3.10"
+      run_script: "ci/build_docs.sh"
   wheel-build-libcugraph:
     # needs: checks
     secrets: inherit
@@ -203,12 +204,12 @@ jobs:
   #       sccache -z;
   #       build-all --verbose -j$(nproc --ignore=1) -DBUILD_CUGRAPH_MG_TESTS=ON;
   #       sccache -s;
-  # telemetry-summarize:
-  #   # 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: Telemetry summarize
-  #       uses: rapidsai/shared-actions/telemetry-dispatch-summarize@main
+  telemetry-summarize:
+    # 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: Telemetry summarize
+        uses: rapidsai/shared-actions/telemetry-dispatch-summarize@main
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -30,8 +30,6 @@ python -m pip wheel \
 
 sccache --show-adv-stats
 
-# TODO(jameslamb): move all the auditwheel stuff into individual build_wheel_{project}.sh like cudf does?
-
 EXCLUDE_ARGS=(
   --exclude "libraft.so"
 )

diff --git a/ci/use_conda_packages_from_prs.sh b/ci/use_conda_packages_from_prs.sh
@@ -1,7 +1,7 @@
 # Copyright (c) 2025, NVIDIA CORPORATION.
 # TODO(jameslamb): remove this file when https://github.com/rapidsai/raft/pull/2531 is merged
 
-RAFT_COMMIT="d275c995fb51310d1340fe2fd6d63d0bfd43cafa"
+RAFT_COMMIT="4b793be27b27d40119706ea5df26cc03c8efe33c"
 
 RAFT_CPP_CHANNEL=$(rapids-get-pr-conda-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}")
 RAFT_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact raft 2531 python "${RAFT_COMMIT:0:7}")

diff --git a/ci/use_wheels_from_prs.sh b/ci/use_wheels_from_prs.sh
@@ -3,7 +3,7 @@
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-RAFT_COMMIT="d275c995fb51310d1340fe2fd6d63d0bfd43cafa"
+RAFT_COMMIT="4b793be27b27d40119706ea5df26cc03c8efe33c"
 LIBRAFT_CHANNEL=$(
   RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-get-pr-wheel-artifact raft 2531 cpp "${RAFT_COMMIT:0:7}"
 )

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -298,7 +298,6 @@ dependencies:
             packages:
               - cudatoolkit
               - cuda-nvtx
-  # TODO(jameslamb): maybe the CUDA wheels were just here to transitively satisfy RAFT's dependencies, and these could be dropped?
   cuda_wheels:
     specific:
       - output_types: pyproject