From 9b28c88bd49696e9507523805b7ba2d39153cbae Mon Sep 17 00:00:00 2001 From: Mike Sarahan Date: Wed, 18 Dec 2024 00:27:34 -0600 Subject: [PATCH 1/2] update telemetry actions to fluent-bit friendly style (#4834) Simplifies telemetry a bit. More details at https://github.com/rapidsai/shared-actions/pull/28. Telemetry will still not be collected until @ajschmidt8 enables the `TELEMETRY_ENABLED` environment variable for this repo. Authors: - Mike Sarahan (https://github.com/msarahan) Approvers: - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cugraph/pull/4834 --- .github/workflows/pr.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a018544c96..aea81c152e 100644 --- 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 From 6783aec7a56f05d5088073c822140bc0cd7d9665 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 18 Dec 2024 09:54:48 -0600 Subject: [PATCH 2/2] Add cuda-python dependency (#4829) cuGraph depends on `cuda-python` but does not currently list that dependency. This PR adds it. Authors: - Bradley Dice (https://github.com/bdice) - Ralph Liu (https://github.com/nv-rliu) Approvers: - James Lamb (https://github.com/jameslamb) URL: https://github.com/rapidsai/cugraph/pull/4829 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/environments/all_cuda-125_arch-x86_64.yaml | 1 + dependencies.yaml | 9 +++++++++ python/cugraph/pyproject.toml | 1 + 4 files changed, 12 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index d98db2232e..c5f683afd0 100644 --- 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 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 34bef310fe..21eda1c098 100644 --- 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 diff --git a/dependencies.yaml b/dependencies.yaml index b271abc627..9ee9031440 100755 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -401,6 +401,15 @@ dependencies: # dataset APIs require [http] extras for use with cudf. - fsspec[http]>=0.6.0 specific: + - output_types: [conda, requirements, pyproject] + matrices: + - matrix: + cuda: "12.*" + packages: + - cuda-python>=12.6.2,<13.0a0 + - matrix: # All CUDA 11 versions + packages: + - cuda-python>=11.8.5,<12.0a0 - output_types: pyproject matrices: - matrix: diff --git a/python/cugraph/pyproject.toml b/python/cugraph/pyproject.toml index 481f151ac2..8fa3a0938e 100644 --- a/python/cugraph/pyproject.toml +++ b/python/cugraph/pyproject.toml @@ -23,6 +23,7 @@ authors = [ license = { text = "Apache 2.0" } requires-python = ">=3.10" dependencies = [ + "cuda-python>=11.8.5,<12.0a0", "cudf==25.2.*,>=0.0.0a0", "cupy-cuda11x>=12.0.0", "dask-cuda==25.2.*,>=0.0.0a0",