From 0013186c82fad2a637dc93d19db12908830de3b4 Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:00:03 -0600 Subject: [PATCH 1/3] Update version references in workflow (#93) Update version references in breaking-change trigger workflow Authors: - Jake Awe (https://github.com/AyodeAwe) - James Lamb (https://github.com/jameslamb) Approvers: - James Lamb (https://github.com/jameslamb) URL: https://github.com/rapidsai/cugraph-gnn/pull/93 --- .github/workflows/trigger-breaking-change-alert.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-breaking-change-alert.yaml b/.github/workflows/trigger-breaking-change-alert.yaml index 3b972f3..01dd243 100644 --- a/.github/workflows/trigger-breaking-change-alert.yaml +++ b/.github/workflows/trigger-breaking-change-alert.yaml @@ -12,7 +12,7 @@ jobs: trigger-notifier: if: contains(github.event.pull_request.labels.*.name, 'breaking') secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-24.12 + uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.02 with: sender_login: ${{ github.event.sender.login }} sender_avatar: ${{ github.event.sender.avatar_url }} From cc1bab96a5ddd0355615e5dfe1b073ce0ccd7338 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Dec 2024 13:08:20 -0600 Subject: [PATCH 2/3] build libwholegraph docs in CI (#96) Fixes #94 Uploads API docs for `libwholegraph`, to be used by https://github.com/rapidsai/cugraph-docs/pull/46 Also removes `sphinx` dependencies... this repo only needs to produce Doxygen docs for `libwholegraph`, all the other Sphinx stuff will be done in https://github.com/rapidsai/cugraph-docs. Authors: - James Lamb (https://github.com/jameslamb) - Don Acosta (https://github.com/acostadon) Approvers: - Don Acosta (https://github.com/acostadon) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cugraph-gnn/pull/96 --- .github/workflows/build.yaml | 12 ++++++ .github/workflows/pr.yaml | 10 +++++ ci/build_docs.sh | 43 +++++++++++++++++++ .../all_cuda-118_arch-x86_64.yaml | 8 ---- .../all_cuda-121_arch-x86_64.yaml | 8 ---- .../all_cuda-124_arch-x86_64.yaml | 8 ---- dependencies.yaml | 9 ---- 7 files changed, 65 insertions(+), 33 deletions(-) create mode 100755 ci/build_docs.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 2eb2f31..aa430d6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,6 +43,18 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + docs-build: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 + with: + arch: "amd64" + branch: ${{ inputs.branch }} + build_type: ${{ inputs.build_type || 'branch' }} + container_image: "rapidsai/ci-conda:latest" + date: ${{ inputs.date }} + run_script: "ci/build_docs.sh" + sha: ${{ inputs.sha }} upload-conda: needs: [cpp-build, python-build] secrets: inherit diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f326a9f..f87b30e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -19,6 +19,7 @@ jobs: - conda-cpp-tests - conda-python-build - conda-python-tests + - docs-build - conda-notebook-tests - wheel-build-pylibwholegraph - wheel-tests-pylibwholegraph @@ -116,6 +117,15 @@ jobs: with: build_type: pull-request matrix_filter: map(select(.ARCH == "amd64")) + docs-build: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 + with: + arch: "amd64" + build_type: pull-request + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" wheel-build-pylibwholegraph: needs: checks secrets: inherit diff --git a/ci/build_docs.sh b/ci/build_docs.sh new file mode 100755 index 0000000..4d1c03d --- /dev/null +++ b/ci/build_docs.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# Copyright (c) 2023-2024, NVIDIA CORPORATION. + +set -euo pipefail + +rapids-logger "Create test conda environment" +. /opt/conda/etc/profile.d/conda.sh + +RAPIDS_VERSION="$(rapids-version)" + +rapids-dependency-file-generator \ + --output conda \ + --file-key docs \ + --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml + +rapids-mamba-retry env create --yes -f env.yaml -n docs + +# Temporarily allow unbound variables for conda activation. +set +u +conda activate docs +set -u + +rapids-print-env + +rapids-logger "Downloading artifacts from previous jobs" + +CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +export RAPIDS_DOCS_DIR="$(mktemp -d)" + +rapids-mamba-retry install \ + --channel "${CPP_CHANNEL}" \ + "libwholegraph=${RAPIDS_VERSION}" + +rapids-logger "Build C++ docs" +pushd cpp +doxygen Doxyfile +mkdir -p "${RAPIDS_DOCS_DIR}/libwholegraph/xml_tar" +tar -czf "${RAPIDS_DOCS_DIR}/libwholegraph/xml_tar"/xml.tar.gz -C xml . +popd + +rapids-logger "Output temp dir: ${RAPIDS_DOCS_DIR}" + +RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)" rapids-upload-docs diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 70c974f..33af47b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -23,19 +23,16 @@ dependencies: - graphviz - ipython - nbconvert -- nbsphinx - nccl>=2.19 - ninja - notebook>=0.5.0 - numba>=0.57 - numpy>=1.23,<3.0a0 -- numpydoc - nvcc_linux-64=11.8 - ogb - pandas - pre-commit - pydantic -- pydata-sphinx-theme - pylibcugraphops==25.2.*,>=0.0.0a0 - pylibraft==25.2.*,>=0.0.0a0 - pytest @@ -48,15 +45,10 @@ dependencies: - pytorch_geometric>=2.5,<2.6 - raft-dask==25.2.*,>=0.0.0a0 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- recommonmark - rmm==25.2.*,>=0.0.0a0 - scikit-build-core>=0.10.0 - scipy - setuptools>=61.0.0 -- sphinx-copybutton -- sphinx-markdown-tables -- sphinx<6 -- sphinxcontrib-websupport - torchdata - wheel name: all_cuda-118_arch-x86_64 diff --git a/conda/environments/all_cuda-121_arch-x86_64.yaml b/conda/environments/all_cuda-121_arch-x86_64.yaml index c13e2f9..caed57c 100644 --- a/conda/environments/all_cuda-121_arch-x86_64.yaml +++ b/conda/environments/all_cuda-121_arch-x86_64.yaml @@ -30,18 +30,15 @@ dependencies: - libcusolver-dev - libcusparse-dev - nbconvert -- nbsphinx - nccl>=2.19 - ninja - notebook>=0.5.0 - numba>=0.57 - numpy>=1.23,<3.0a0 -- numpydoc - ogb - pandas - pre-commit - pydantic -- pydata-sphinx-theme - pylibcugraphops==25.2.*,>=0.0.0a0 - pylibraft==25.2.*,>=0.0.0a0 - pytest @@ -54,15 +51,10 @@ dependencies: - pytorch_geometric>=2.5,<2.6 - raft-dask==25.2.*,>=0.0.0a0 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- recommonmark - rmm==25.2.*,>=0.0.0a0 - scikit-build-core>=0.10.0 - scipy - setuptools>=61.0.0 -- sphinx-copybutton -- sphinx-markdown-tables -- sphinx<6 -- sphinxcontrib-websupport - torchdata - wheel name: all_cuda-121_arch-x86_64 diff --git a/conda/environments/all_cuda-124_arch-x86_64.yaml b/conda/environments/all_cuda-124_arch-x86_64.yaml index f71d960..53c8825 100644 --- a/conda/environments/all_cuda-124_arch-x86_64.yaml +++ b/conda/environments/all_cuda-124_arch-x86_64.yaml @@ -30,18 +30,15 @@ dependencies: - libcusolver-dev - libcusparse-dev - nbconvert -- nbsphinx - nccl>=2.19 - ninja - notebook>=0.5.0 - numba>=0.57 - numpy>=1.23,<3.0a0 -- numpydoc - ogb - pandas - pre-commit - pydantic -- pydata-sphinx-theme - pylibcugraphops==25.2.*,>=0.0.0a0 - pylibraft==25.2.*,>=0.0.0a0 - pytest @@ -54,15 +51,10 @@ dependencies: - pytorch_geometric>=2.5,<2.6 - raft-dask==25.2.*,>=0.0.0a0 - rapids-build-backend>=0.3.0,<0.4.0.dev0 -- recommonmark - rmm==25.2.*,>=0.0.0a0 - scikit-build-core>=0.10.0 - scipy - setuptools>=61.0.0 -- sphinx-copybutton -- sphinx-markdown-tables -- sphinx<6 -- sphinxcontrib-websupport - torchdata - wheel name: all_cuda-124_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index d19e98c..0e08523 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -297,15 +297,6 @@ dependencies: - breathe - doxygen - graphviz - - ipython - - nbsphinx - - numpydoc - - pydata-sphinx-theme - - recommonmark - - sphinx-copybutton - - sphinx-markdown-tables - - sphinx<6 - - sphinxcontrib-websupport py_version: specific: - output_types: [conda] From e641496cb4f1e9d1f41b11841c9e332875603ac1 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Dec 2024 14:59:41 -0600 Subject: [PATCH 3/3] fix nightly docs workflow dependencies (#97) The branch build triggered by merging #96 failed immediately. > The workflow is not valid. .github/workflows/build.yaml (Line: 47, Col: 12): Job 'docs-build' depends on unknown job 'conda-cpp-build'. ([build link](https://github.com/rapidsai/cugraph-gnn/actions/runs/12379736454)) This fixes that. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Don Acosta (https://github.com/acostadon) - Bradley Dice (https://github.com/bdice) URL: https://github.com/rapidsai/cugraph-gnn/pull/97 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aa430d6..15e3342 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -44,7 +44,7 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} docs-build: - needs: conda-cpp-build + needs: cpp-build secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02 with: