From a1ebed98cba8f90404b06f51c15d67cd30cde019 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Wed, 18 Jan 2023 11:53:56 -0600 Subject: [PATCH 01/34] initial docs build draft --- .github/workflows/build.yaml | 11 ++++ .github/workflows/pr.yaml | 11 ++++ ci/build_docs.sh | 55 +++++++++++++++++++ .../all_cuda-115_arch-x86_64.yaml | 9 --- dependencies.yaml | 11 +++- env.yaml | 0 6 files changed, 86 insertions(+), 11 deletions(-) create mode 100755 ci/build_docs.sh create mode 100644 env.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 620a13fe173..9b4a4415f40 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,3 +52,14 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + docs-build: + if: ${{ startsWith(github.ref, 'refs/heads/branch-') }} + needs: python-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118 + with: + build_type: branch + node_type: "gpu-latest-1" + arch: "amd64" + container_image: "rapidsai/ci:latest" + run_script: "ci/build_docs.sh" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 9df34c483f4..5d41b49aa83 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -18,6 +18,7 @@ jobs: - conda-notebook-tests - conda-python-build - conda-python-tests + - docs-build secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main checks: @@ -58,3 +59,13 @@ jobs: arch: "amd64" container_image: "rapidsai/ci:latest" run_script: "ci/test_notebooks.sh" + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118 + with: + build_type: pull-request + node_type: "gpu-latest-1" + arch: "amd64" + container_image: "rapidsai/ci:latest" + run_script: "ci/build_docs.sh" diff --git a/ci/build_docs.sh b/ci/build_docs.sh new file mode 100755 index 00000000000..56771d7f58e --- /dev/null +++ b/ci/build_docs.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Copyright (c) 2023, NVIDIA CORPORATION. + +set -euo pipefail + +rapids-logger "Create test conda environment" +. /opt/conda/etc/profile.d/conda.sh + +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 --force -f env.yaml -n test +conda activate test + +rapids-print-env + +rapids-logger "Downloading artifacts from previous jobs" +CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +VERSION_NUMBER=$(rapids-get-rapids-version-from-git) + +rapids-mamba-retry install \ + --channel "${CPP_CHANNEL}" \ + --channel "${PYTHON_CHANNEL}" \ + libcugraph \ + pylibcugraph \ + cugraph \ + cugraph-pyg \ + cugraph-service-server \ + cugraph-service-client \ + libcugraph_etl + + +# Build Doxygen docs +gpuci_logger "Build Doxygen docs" +# wget "https://raw.githubusercontent.com/rapidsai/docs/gh-pages/api/librmm/${VERSION_NUMBER}/rmm.tag" || echo "Failed to download rmm Doxygen tag" +pushd cpp/doxygen +doxygen Doxyfile +popd + +# Build Python docs +gpuci_logger "Build Sphinx docs" +pushd docs/cugraph +sphinx-build -b dirhtml source _html +sphinx-build -b text source _text +popd + + +if [[ ${RAPIDS_BUILD_TYPE} == "branch" ]]; then + aws s3 sync --delete python/docs/_html "s3://rapidsai-docs/rmm/${VERSION_NUMBER}/html" + aws s3 sync --delete python/docs/_text "s3://rapidsai-docs/rmm/${VERSION_NUMBER}/txt" + aws s3 sync --delete doxygen/html "s3://rapidsai-docs/librmm/${VERSION_NUMBER}/html" +fi \ No newline at end of file diff --git a/conda/environments/all_cuda-115_arch-x86_64.yaml b/conda/environments/all_cuda-115_arch-x86_64.yaml index 96838c144a1..46b4856627e 100644 --- a/conda/environments/all_cuda-115_arch-x86_64.yaml +++ b/conda/environments/all_cuda-115_arch-x86_64.yaml @@ -19,7 +19,6 @@ dependencies: - dask-cudf=23.02.* - dask>=2022.12.0 - distributed>=2022.12.0 -- doxygen - gmock=1.10.0 - gtest=1.10.0 - ipython @@ -28,35 +27,27 @@ dependencies: - libraft-distance=23.02.* - libraft-headers=23.02.* - librmm=23.02.* -- nbsphinx - nccl>=2.9.9 - networkx>=2.5.1,<3.0 - ninja - notebook>=0.5.0 -- numpydoc - nvcc_linux-64=11.5 - ogb - openmpi - pip - pre-commit - py -- pydata-sphinx-theme - pylibraft=23.02.* - pytest - pytest-cov - python-louvain - raft-dask=23.02.* - rapids-pytest-benchmark -- recommonmark - requests - rmm=23.02.* - scikit-build>=0.13.1 - scikit-learn>=0.23.1 - scipy -- sphinx -- sphinx-copybutton -- sphinx-markdown-tables -- sphinxcontrib-websupport - ucx-proc=*=gpu - ucx-py=0.30.* name: all_cuda-115_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 953ccc545b5..5d3231a7c1d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -11,7 +11,6 @@ files: - common_python_test - cpp_build - cudatoolkit - - doc - python_build - test_notebook - test_python @@ -20,6 +19,12 @@ files: includes: - checks - py_version + docs: + output: none + includes: + - cudatoolkit + - py_version + - docs_build test_cpp: output: none includes: @@ -133,7 +138,7 @@ dependencies: - scikit-build>=0.13.1 - ucx-proc=*=gpu - ucx-py=0.30.* - doc: + docs_build: common: - output_types: [conda] packages: @@ -143,6 +148,8 @@ dependencies: - pydata-sphinx-theme - recommonmark - sphinx + - sphinx_rtd_theme + - ipython - sphinxcontrib-websupport - sphinx-markdown-tables - sphinx-copybutton diff --git a/env.yaml b/env.yaml new file mode 100644 index 00000000000..e69de29bb2d From 50b27ba3efc3c181173756167d5c523cbd466692 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Thu, 19 Jan 2023 09:28:52 -0600 Subject: [PATCH 02/34] add dgl --- ci/build_docs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 56771d7f58e..25cda5231f6 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -30,7 +30,8 @@ rapids-mamba-retry install \ cugraph-pyg \ cugraph-service-server \ cugraph-service-client \ - libcugraph_etl + libcugraph_etl \ + cugraph_dgl # Build Doxygen docs From 1c8e7952206b828c3d79553ace709afc9496f3ef Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Fri, 20 Jan 2023 10:27:47 -0600 Subject: [PATCH 03/34] dgl --- ci/build_docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 25cda5231f6..842f7feb13f 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -31,7 +31,7 @@ rapids-mamba-retry install \ cugraph-service-server \ cugraph-service-client \ libcugraph_etl \ - cugraph_dgl + cugraph-dgl # Build Doxygen docs From eeb3e1745bef5e980a50d24dd01ca167561e2da1 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Mon, 23 Jan 2023 14:55:43 -0600 Subject: [PATCH 04/34] dgl fix --- ci/build_docs.sh | 19 +++++++++++-------- env.yaml | 0 2 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 env.yaml diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 842f7feb13f..56f90c870fe 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -30,19 +30,22 @@ rapids-mamba-retry install \ cugraph-pyg \ cugraph-service-server \ cugraph-service-client \ - libcugraph_etl \ - cugraph-dgl + libcugraph_etl + +# This command installs `cugraph-dgl` without its dependencies +# since this package can currently only run in `11.6` CTK environments +# due to the dependency version specifications in its conda recipe. +rapids-mamba-retry install "${PYTHON_CHANNEL}/linux-64/cugraph-dgl-*.tar.bz2" # Build Doxygen docs -gpuci_logger "Build Doxygen docs" -# wget "https://raw.githubusercontent.com/rapidsai/docs/gh-pages/api/librmm/${VERSION_NUMBER}/rmm.tag" || echo "Failed to download rmm Doxygen tag" +rapids-logger "Build Doxygen docs" pushd cpp/doxygen doxygen Doxyfile popd # Build Python docs -gpuci_logger "Build Sphinx docs" +rapids-logger "Build Sphinx docs" pushd docs/cugraph sphinx-build -b dirhtml source _html sphinx-build -b text source _text @@ -50,7 +53,7 @@ popd if [[ ${RAPIDS_BUILD_TYPE} == "branch" ]]; then - aws s3 sync --delete python/docs/_html "s3://rapidsai-docs/rmm/${VERSION_NUMBER}/html" - aws s3 sync --delete python/docs/_text "s3://rapidsai-docs/rmm/${VERSION_NUMBER}/txt" - aws s3 sync --delete doxygen/html "s3://rapidsai-docs/librmm/${VERSION_NUMBER}/html" + aws s3 sync --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" + aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" + aws s3 sync --delete cpp/doxygen "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" fi \ No newline at end of file diff --git a/env.yaml b/env.yaml deleted file mode 100644 index e69de29bb2d..00000000000 From bd9eb1247508d9dd15b7b5d66f559a057993c62f Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Tue, 24 Jan 2023 08:42:57 -0600 Subject: [PATCH 05/34] pin sphinx --- ci/build_docs.sh | 2 +- dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 56f90c870fe..968d57fdabf 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -55,5 +55,5 @@ popd if [[ ${RAPIDS_BUILD_TYPE} == "branch" ]]; then aws s3 sync --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" - aws s3 sync --delete cpp/doxygen "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" + aws s3 sync --delete cpp/doxygen/html "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" fi \ No newline at end of file diff --git a/dependencies.yaml b/dependencies.yaml index 5d3231a7c1d..8fba1c502e9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -147,7 +147,7 @@ dependencies: - numpydoc - pydata-sphinx-theme - recommonmark - - sphinx + - sphinx<6 - sphinx_rtd_theme - ipython - sphinxcontrib-websupport From 9083ec2092e73615a99869a8cfd132a8d1776026 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Fri, 27 Jan 2023 14:05:08 -0600 Subject: [PATCH 06/34] fix typos --- ci/build_docs.sh | 9 +++++---- dependencies.yaml | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 968d57fdabf..60cf14d0fbd 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -11,8 +11,8 @@ rapids-dependency-file-generator \ --file_key docs \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml -rapids-mamba-retry env create --force -f env.yaml -n test -conda activate test +rapids-mamba-retry env create --force -f env.yaml -n docs +conda activate docs rapids-print-env @@ -52,8 +52,9 @@ sphinx-build -b text source _text popd -if [[ ${RAPIDS_BUILD_TYPE} == "branch" ]]; then +if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then + rapids-logger "Upload Docs to S3" aws s3 sync --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" - aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" + aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/text" aws s3 sync --delete cpp/doxygen/html "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" fi \ No newline at end of file diff --git a/dependencies.yaml b/dependencies.yaml index cf7548d5731..d53ac6074fc 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -23,8 +23,8 @@ files: output: none includes: - cudatoolkit - - py_version - docs_build + - py_version test_cpp: output: none includes: @@ -104,6 +104,21 @@ dependencies: cuda: "11.5" packages: - nvcc_linux-aarch64=11.5 + docs_build: + common: + - output_types: [conda] + packages: + - doxygen + - ipython + - nbsphinx + - numpydoc + - pydata-sphinx-theme + - recommonmark + - sphinx_rtd_theme + - sphinx-copybutton + - sphinx-markdown-tables + - sphinx<6 + - sphinxcontrib-websupport py_version: specific: - output_types: [conda] @@ -138,21 +153,6 @@ dependencies: - scikit-build>=0.13.1 - ucx-proc=*=gpu - ucx-py=0.30.* - docs_build: - common: - - output_types: [conda] - packages: - - doxygen - - nbsphinx - - numpydoc - - pydata-sphinx-theme - - recommonmark - - sphinx<6 - - sphinx_rtd_theme - - ipython - - sphinxcontrib-websupport - - sphinx-markdown-tables - - sphinx-copybutton common_python_test: common: - output_types: [conda, requirements] From fc28fcecc91526a8e0787ffa2b4b9d04434354b3 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Fri, 27 Jan 2023 14:27:09 -0600 Subject: [PATCH 07/34] update conda yaml --- conda/environments/all_cuda-118_arch-x86_64.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c3cbde6be4d..4156e1eed36 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -19,6 +19,7 @@ dependencies: - dask-cudf=23.02.* - dask>=2022.12.0 - distributed>=2022.12.0 +- doxygen - gcc_linux-64=9.* - gmock=1.10.0 - gtest=1.10.0 @@ -28,27 +29,36 @@ dependencies: - libraft-distance=23.02.* - libraft-headers=23.02.* - librmm=23.02.* +- nbsphinx - nccl>=2.9.9 - networkx>=2.5.1 - ninja - notebook>=0.5.0 +- numpydoc - nvcc_linux-64=11.8 - ogb - openmpi - pip - pre-commit - py +- pydata-sphinx-theme - pylibraft=23.02.* - pytest - pytest-cov - python-louvain - raft-dask=23.02.* - rapids-pytest-benchmark +- recommonmark - requests - rmm=23.02.* - scikit-build>=0.13.1 - scikit-learn>=0.23.1 - scipy +- sphinx-copybutton +- sphinx-markdown-tables +- sphinx<6 +- sphinx_rtd_theme +- sphinxcontrib-websupport - ucx-proc=*=gpu - ucx-py=0.30.* name: all_cuda-118_arch-x86_64 From 4fe5a465cac8f15d7982a9ee152e84fc50ad56d4 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Fri, 27 Jan 2023 15:53:20 -0600 Subject: [PATCH 08/34] fix commit --- ci/build_docs.sh | 2 +- compare.yaml | 191 ----------------------------------------------- 2 files changed, 1 insertion(+), 192 deletions(-) delete mode 100644 compare.yaml diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 60cf14d0fbd..31d85939c33 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -55,6 +55,6 @@ popd if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then rapids-logger "Upload Docs to S3" aws s3 sync --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" - aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/text" + aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" aws s3 sync --delete cpp/doxygen/html "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" fi \ No newline at end of file diff --git a/compare.yaml b/compare.yaml deleted file mode 100644 index 70325aee1b6..00000000000 --- a/compare.yaml +++ /dev/null @@ -1,191 +0,0 @@ -# Dependency list for https://github.com/rapidsai/dependency-file-generator -files: - all: - output: [conda] - matrix: - cuda: ["11.8"] - arch: [x86_64] - includes: - - checks - - common_build - - common_python_test - - cpp_build - - cudatoolkit - - doc - - python_build - - test_notebook - - test_python - checks: - output: none - includes: - - checks - - py_version - test_cpp: - output: none - includes: - - cudatoolkit - test_notebooks: - output: none - includes: - - common_python_test - - cudatoolkit - - py_version - - test_notebook - test_python: - output: none - includes: - - common_python_test - - cudatoolkit - - py_version - - test_python -channels: - - rapidsai - - rapidsai-nightly - - dask/label/dev - - conda-forge - - nvidia -dependencies: - checks: - common: - - output_types: [conda, requirements] - packages: - - pre-commit - cudatoolkit: - specific: - - output_types: [conda] - matrices: - - matrix: - cuda: "11.8" - packages: - - cudatoolkit=11.8 - - matrix: - cuda: "11.5" - packages: - - cudatoolkit=11.5 - - matrix: - cuda: "11.4" - packages: - - cudatoolkit=11.4 - - matrix: - cuda: "11.2" - packages: - - cudatoolkit=11.2 - common_build: - common: - - output_types: [conda] - packages: - - cmake>=3.23.1,!=3.25.0 - - ninja - - pip - cpp_build: - common: - - output_types: [conda] - packages: - - c-compiler - - cxx-compiler - - gmock=1.10.0 - - gtest=1.10.0 - - libcugraphops=23.02.* - - libraft-headers=23.02.* - - libraft-distance=23.02.* - - librmm=23.02.* - - openmpi # Required for building cpp-mgtests (multi-GPU tests) - specific: - - output_types: [conda] - matrices: - - matrix: - arch: x86_64 - packages: - - gcc_linux-64=9.* - - matrix: - arch: aarch64 - packages: - - gcc_linux-aarch64=9.* - - output_types: [conda] - matrices: - - matrix: - arch: x86_64 - cuda: "11.8" - packages: - - nvcc_linux-64=11.8 - - matrix: - arch: aarch64 - cuda: "11.8" - packages: - - nvcc_linux-aarch64=11.8 - py_version: - specific: - - output_types: [conda] - matrices: - - matrix: - py: "3.8" - packages: - - python=3.8 - - matrix: - py: "3.9" - packages: - - python=3.9 - - matrix: - py: "3.10" - packages: - - python=3.10 - - matrix: - packages: - - python>=3.8,<3.11 - python_build: - common: - - output_types: [conda] - packages: - - cuda-python>=11.7.1,<12.0 - - cudf=23.02.* - - cython>=0.29,<0.30 - - dask>=2022.12.0 - - dask-cuda=23.02.* - - dask-cudf=23.02.* - - distributed>=2022.12.0 - - libcudf=23.02.* - - nccl>=2.9.9 - - pylibraft=23.02.* - - raft-dask=23.02.* - - rmm=23.02.* - - scikit-build>=0.13.1 - - ucx-proc=*=gpu - - ucx-py=0.30.* - doc: - common: - - output_types: [conda] - packages: - - doxygen - - nbsphinx - - numpydoc - - pydata-sphinx-theme - - recommonmark - - sphinx - - sphinxcontrib-websupport - - sphinx-markdown-tables - - sphinx-copybutton - common_python_test: - common: - - output_types: [conda, requirements] - packages: - - aiohttp - - networkx>=2.5.1 - - requests - - scipy - test_notebook: - common: - - output_types: [conda, requirements] - packages: - - ipython - - notebook>=0.5.0 - test_python: - common: - - output_types: [conda, requirements] - packages: - - ogb - - py - - pytest - - pytest-cov - - python-louvain - - rapids-pytest-benchmark - - scikit-learn>=0.23.1 \ No newline at end of file From 899f274f0a28fa80015adfb4124d3a4f89b119c6 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Sat, 28 Jan 2023 12:39:24 -0600 Subject: [PATCH 09/34] log install cmd --- ci/build_docs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 31d85939c33..46d266e4658 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -35,7 +35,10 @@ rapids-mamba-retry install \ # This command installs `cugraph-dgl` without its dependencies # since this package can currently only run in `11.6` CTK environments # due to the dependency version specifications in its conda recipe. +rapids-logger "Install cugraph-dgl" +set -x rapids-mamba-retry install "${PYTHON_CHANNEL}/linux-64/cugraph-dgl-*.tar.bz2" +set +x # Build Doxygen docs From 9c37bbb32b28fdf327245edc8fbd81015399de22 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Sun, 29 Jan 2023 10:15:34 -0600 Subject: [PATCH 10/34] add -W flag --- ci/build_docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 46d266e4658..5ee6b9e9cb7 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -50,8 +50,8 @@ popd # Build Python docs rapids-logger "Build Sphinx docs" pushd docs/cugraph -sphinx-build -b dirhtml source _html -sphinx-build -b text source _text +sphinx-build -b dirhtml source _html -W +sphinx-build -b text source _text -W popd From 9e332c95558c4e83688b09bf54f97bd575195d66 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Mon, 30 Jan 2023 09:16:54 -0600 Subject: [PATCH 11/34] cast html_theme_path to list --- docs/cugraph/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/cugraph/source/conf.py b/docs/cugraph/source/conf.py index 59738930020..6e9b022ebd1 100644 --- a/docs/cugraph/source/conf.py +++ b/docs/cugraph/source/conf.py @@ -122,7 +122,7 @@ import pydata_sphinx_theme import sphinx_rtd_theme html_theme = 'pydata_sphinx_theme' - html_theme_path = sphinx_rtd_theme.get_html_theme_path() + html_theme_path = list(sphinx_rtd_theme.get_html_theme_path()) # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False From 42b9b560299f41f61284ac128786722bcbd25b17 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Mon, 13 Feb 2023 18:45:07 -0500 Subject: [PATCH 12/34] update shared workflows branch --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1b87863dbdd..5d30e980777 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -56,7 +56,7 @@ jobs: if: ${{ startsWith(github.ref, 'refs/heads/branch-') }} needs: python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 with: build_type: branch node_type: "gpu-latest-1" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b9db2639b1d..93e8c49152b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -66,7 +66,7 @@ jobs: docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118 + uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 with: build_type: pull-request node_type: "gpu-latest-1" From 5bc74bd8d58898351c4163395945023a87bf0f5f Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Fri, 17 Feb 2023 14:00:39 -0600 Subject: [PATCH 13/34] prevent nightly docs runs --- .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 5d30e980777..e0746cdca72 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,7 +53,7 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} docs-build: - if: ${{ startsWith(github.ref, 'refs/heads/branch-') }} + if: github.ref_type == 'branch' && github.event_name == 'push' needs: python-build secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.04 From c14be0d78ddda40090a4b4df94814df666e2c262 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:01:20 -0500 Subject: [PATCH 14/34] update `.gitignore` to ignore doc build dirs --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 530ccffcae8..4115f228538 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,5 @@ python/cugraph/cugraph/tests/dask-worker-space # Sphinx docs & build artifacts docs/cugraph/source/api_docs/api/* +_html +_text From e04a25c1dfad7879f080f5cbc2836d7d5c019922 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:01:54 -0500 Subject: [PATCH 15/34] add `graphviz` to doc build deps --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + dependencies.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index e1ce29521e0..db0a044987b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -22,6 +22,7 @@ dependencies: - doxygen - gcc_linux-64=9.* - gmock=1.10.0 +- graphviz - gtest=1.10.0 - ipython - libcudf=23.04.* diff --git a/dependencies.yaml b/dependencies.yaml index 6af4b861638..d6aaabf212f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -124,6 +124,7 @@ dependencies: - output_types: [conda] packages: - doxygen + - graphviz - ipython - nbsphinx - numpydoc From 203134593551afe81d529cc280bc3d1e6f5070e1 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:03:15 -0500 Subject: [PATCH 16/34] rm unnecessary `conf.py` header lines --- docs/cugraph/source/conf.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/cugraph/source/conf.py b/docs/cugraph/source/conf.py index 5d12c8e6274..2594850550b 100644 --- a/docs/cugraph/source/conf.py +++ b/docs/cugraph/source/conf.py @@ -1,6 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# # Copyright (c) 2018-2023, NVIDIA CORPORATION. # # pygdf documentation build configuration file, created by From a59089e866f5896322efb4ac2e6162e265650d27 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:05:48 -0500 Subject: [PATCH 17/34] remove `conf.py` imports According to the [`autodoc` documentation](https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html), `autodoc` will automatically import the modules to be documented. The CI docs building process will install the packages that were built in previous stages of the workflow and presumably `autodoc` will import those correctly, which means these lines are not needed. --- docs/cugraph/source/conf.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/cugraph/source/conf.py b/docs/cugraph/source/conf.py index 2594850550b..b19c2156256 100644 --- a/docs/cugraph/source/conf.py +++ b/docs/cugraph/source/conf.py @@ -24,8 +24,6 @@ # is relative to the documentation root, use os.path.abspath to make it # absolute, like shown here. sys.path.insert(0, os.path.abspath('sphinxext')) -sys.path.insert(0, os.path.abspath('../../python')) -sys.path.insert(0, os.path.abspath('../..')) from github_link import make_linkcode_resolve # noqa From a88b1a0ab031b6e8e6200c3db2242ba75f8e48e7 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:06:19 -0500 Subject: [PATCH 18/34] rm unnecessary `rtd` lines in `conf.py` --- docs/cugraph/source/conf.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/cugraph/source/conf.py b/docs/cugraph/source/conf.py index b19c2156256..4d11d4ef962 100644 --- a/docs/cugraph/source/conf.py +++ b/docs/cugraph/source/conf.py @@ -107,18 +107,6 @@ html_theme = 'pydata_sphinx_theme' -# on_rtd is whether we are on readthedocs.org -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' - -if not on_rtd: - # only import and set the theme if we're building docs locally - # otherwise, readthedocs.org uses their theme by default, - # so no need to specify it - import pydata_sphinx_theme - import sphinx_rtd_theme - html_theme = 'pydata_sphinx_theme' - html_theme_path = list(sphinx_rtd_theme.get_html_theme_path()) - # If true, `todo` and `todoList` produce output, else they produce nothing. todo_include_todos = False From f1d70dd818e2dc4c9e3417dce6b8fb85ddf028b1 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:07:18 -0500 Subject: [PATCH 19/34] fix some easy formatting warnings --- docs/cugraph/source/api_docs/centrality.rst | 2 +- docs/cugraph/source/api_docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cugraph/source/api_docs/centrality.rst b/docs/cugraph/source/api_docs/centrality.rst index 92f7125238c..9b634cb6deb 100644 --- a/docs/cugraph/source/api_docs/centrality.rst +++ b/docs/cugraph/source/api_docs/centrality.rst @@ -28,7 +28,7 @@ Katz Centrality (MG) cugraph.dask.centrality.katz_centrality.katz_centrality Degree Centrality ---------------- +----------------- .. autosummary:: :toctree: api/ diff --git a/docs/cugraph/source/api_docs/index.rst b/docs/cugraph/source/api_docs/index.rst index a8d02545146..0e7598af08e 100644 --- a/docs/cugraph/source/api_docs/index.rst +++ b/docs/cugraph/source/api_docs/index.rst @@ -1,5 +1,5 @@ Python API reference -============= +==================== This page provides a list of all publicly accessible modules, methods and classes through ``cugraph.*`` namespace. From f6898046fe5a6b199250defa7007b5aeded65998 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:07:54 -0500 Subject: [PATCH 20/34] fix "critical" build warnings --- python/cugraph/cugraph/link_analysis/pagerank.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/cugraph/cugraph/link_analysis/pagerank.py b/python/cugraph/cugraph/link_analysis/pagerank.py index 8b46649bac7..13b60462751 100644 --- a/python/cugraph/cugraph/link_analysis/pagerank.py +++ b/python/cugraph/cugraph/link_analysis/pagerank.py @@ -77,7 +77,9 @@ def pagerank( increases when the tolerance descreases and/or alpha increases toward the limiting value of 1. The user is free to use default values or to provide inputs for the initial guess, tolerance and maximum number of iterations. - Parameters. All edges will have an edge_attr value of 1.0 if not provided. + All edges will have an edge_attr value of 1.0 if not provided. + + Parameters ---------- G : cugraph.Graph or networkx.Graph cuGraph graph descriptor, should contain the connectivity information @@ -158,6 +160,7 @@ def pagerank( Contains the vertex identifiers df['pagerank'] : cudf.Series Contains the PageRank score + Examples -------- >>> from cugraph.experimental.datasets import karate From 31bf9558ef5e56fdae1dee275f45f9a33806e5fe Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:24:47 -0500 Subject: [PATCH 21/34] apply `cugraph-dgl` patch from Vibhu --- .../cugraph_dgl/dataloading/dataloader.py | 13 ++++++++----- .../cugraph-dgl/cugraph_dgl/dataloading/dataset.py | 7 ++++--- .../dataloading/utils/sampling_helpers.py | 10 +++++----- python/cugraph-dgl/cugraph_dgl/nn/conv/gatconv.py | 1 + .../cugraph-dgl/cugraph_dgl/nn/conv/relgraphconv.py | 1 + python/cugraph-dgl/cugraph_dgl/nn/conv/sageconv.py | 1 + 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py index f83795ac335..998ab737fa7 100644 --- a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py +++ b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py @@ -13,14 +13,11 @@ from __future__ import annotations import os import shutil -import torch import cugraph_dgl import cupy as cp import cudf from cugraph.experimental import BulkSampler from dask.distributed import default_client, Event -import dgl -from dgl.dataloading import WorkerInitWrapper, create_tensorized_dataset from cugraph_dgl.dataloading import ( HomogenousBulkSamplerDataset, HetrogenousBulkSamplerDataset, @@ -28,6 +25,10 @@ from cugraph_dgl.dataloading.utils.extract_graph_helpers import ( create_cugraph_graph_from_edges_dict, ) +from cugraph.utilities.utils import import_optional + +dgl = import_optional("dgl") +torch = import_optional("torch") class DataLoader(torch.utils.data.DataLoader): @@ -128,7 +129,9 @@ def __init__( self.shuffle = shuffle self.drop_last = drop_last self.graph_sampler = graph_sampler - worker_init_fn = WorkerInitWrapper(kwargs.get("worker_init_fn", None)) + worker_init_fn = dgl.dataloading.WorkerInitWrapper( + kwargs.get("worker_init_fn", None) + ) self.other_storages = {} self.epoch_number = 0 self._batch_size = batch_size @@ -138,7 +141,7 @@ def __init__( indices = _dgl_idx_to_cugraph_idx(indices, graph) - self.tensorized_indices_ds = create_tensorized_dataset( + self.tensorized_indices_ds = dgl.dataloading.create_tensorized_dataset( indices, batch_size, drop_last, use_ddp, ddp_seed, shuffle ) if len(graph.ntypes) <= 1: diff --git a/python/cugraph-dgl/cugraph_dgl/dataloading/dataset.py b/python/cugraph-dgl/cugraph_dgl/dataloading/dataset.py index 92e65121acd..f45cdc7b32c 100644 --- a/python/cugraph-dgl/cugraph_dgl/dataloading/dataset.py +++ b/python/cugraph-dgl/cugraph_dgl/dataloading/dataset.py @@ -20,9 +20,10 @@ create_heterogeneous_sampled_graphs_from_dataframe, ) -# TODO: Make optional imports -import torch -import dgl +from cugraph.utilities.utils import import_optional + +dgl = import_optional("dgl") +torch = import_optional("torch") # Todo: maybe should switch to __iter__ diff --git a/python/cugraph-dgl/cugraph_dgl/dataloading/utils/sampling_helpers.py b/python/cugraph-dgl/cugraph_dgl/dataloading/utils/sampling_helpers.py index 083c7bb4971..69f2ed1c4a3 100644 --- a/python/cugraph-dgl/cugraph_dgl/dataloading/utils/sampling_helpers.py +++ b/python/cugraph-dgl/cugraph_dgl/dataloading/utils/sampling_helpers.py @@ -12,16 +12,16 @@ # limitations under the License. from __future__ import annotations from typing import Tuple, Dict -from torch.utils.dlpack import from_dlpack from collections import defaultdict import cudf -import torch -import dgl +from cugraph.utilities.utils import import_optional + +dgl = import_optional("dgl") +torch = import_optional("torch") def cast_to_tensor(ser: cudf.Series): - # TODO: Maybe use torch.as_tensor - return from_dlpack(ser.values.toDlpack()) + return torch.as_tensor(ser.values, device="cuda") def create_homogeneous_sampled_graphs_from_dataframe( diff --git a/python/cugraph-dgl/cugraph_dgl/nn/conv/gatconv.py b/python/cugraph-dgl/cugraph_dgl/nn/conv/gatconv.py index 36f00281bbc..112d2350a9c 100644 --- a/python/cugraph-dgl/cugraph_dgl/nn/conv/gatconv.py +++ b/python/cugraph-dgl/cugraph_dgl/nn/conv/gatconv.py @@ -13,6 +13,7 @@ """Torch Module for graph attention network layer using the aggregation primitives in cugraph-ops""" # pylint: disable=no-member, arguments-differ, invalid-name, too-many-arguments +from __future__ import annotations from typing import Optional from cugraph.utilities.utils import import_optional diff --git a/python/cugraph-dgl/cugraph_dgl/nn/conv/relgraphconv.py b/python/cugraph-dgl/cugraph_dgl/nn/conv/relgraphconv.py index 646f50dce0d..f93905ba7ec 100644 --- a/python/cugraph-dgl/cugraph_dgl/nn/conv/relgraphconv.py +++ b/python/cugraph-dgl/cugraph_dgl/nn/conv/relgraphconv.py @@ -13,6 +13,7 @@ """Torch Module for Relational graph convolution layer using the aggregation primitives in cugraph-ops""" # pylint: disable=no-member, arguments-differ, invalid-name, too-many-arguments +from __future__ import annotations import math from typing import Optional diff --git a/python/cugraph-dgl/cugraph_dgl/nn/conv/sageconv.py b/python/cugraph-dgl/cugraph_dgl/nn/conv/sageconv.py index 50749eb5acb..fa69dab4b57 100644 --- a/python/cugraph-dgl/cugraph_dgl/nn/conv/sageconv.py +++ b/python/cugraph-dgl/cugraph_dgl/nn/conv/sageconv.py @@ -13,6 +13,7 @@ """Torch Module for GraphSAGE layer using the aggregation primitives in cugraph-ops""" # pylint: disable=no-member, arguments-differ, invalid-name, too-many-arguments +from __future__ import annotations from typing import Optional from cugraph.utilities.utils import import_optional From c93d31b5a658ce1c1e612ddf45a18f014b907561 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 18:30:42 -0500 Subject: [PATCH 22/34] fix copyright header --- python/cugraph/cugraph/link_analysis/pagerank.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/cugraph/link_analysis/pagerank.py b/python/cugraph/cugraph/link_analysis/pagerank.py index 13b60462751..057ba0383c3 100644 --- a/python/cugraph/cugraph/link_analysis/pagerank.py +++ b/python/cugraph/cugraph/link_analysis/pagerank.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2022, NVIDIA CORPORATION. +# Copyright (c) 2019-2023, NVIDIA CORPORATION. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at From ccc006a6448a5eec40cb202432cbf50f0cd8e676 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 20:51:27 -0500 Subject: [PATCH 23/34] rm dead doc import --- docs/cugraph/source/api_docs/cugraph_pyg.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/cugraph/source/api_docs/cugraph_pyg.rst b/docs/cugraph/source/api_docs/cugraph_pyg.rst index b2772450c44..7e25b3547bf 100644 --- a/docs/cugraph/source/api_docs/cugraph_pyg.rst +++ b/docs/cugraph/source/api_docs/cugraph_pyg.rst @@ -10,6 +10,5 @@ cugraph-pyg :toctree: api/ cugraph_pyg.data.cugraph_store.EXPERIMENTAL__CuGraphStore - cugraph_pyg.loader.dispatch.call_cugraph_algorithm cugraph_pyg.sampler.cugraph_sampler.EXPERIMENTAL__CuGraphSampler From d656d5679b05f333700ae695ebdea1c29d6d1333 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 20:51:44 -0500 Subject: [PATCH 24/34] fix "critical" build warnings --- python/cugraph-dgl/cugraph_dgl/cugraph_storage.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/cugraph-dgl/cugraph_dgl/cugraph_storage.py b/python/cugraph-dgl/cugraph_dgl/cugraph_storage.py index 4a8e62f347c..e845ea147dc 100644 --- a/python/cugraph-dgl/cugraph_dgl/cugraph_storage.py +++ b/python/cugraph-dgl/cugraph_dgl/cugraph_storage.py @@ -83,6 +83,7 @@ def __init__( information this can be ``torch.int32`` or ``torch.int64`` for PyTorch. Defaults to ``torch.int64`` if pytorch is installed + Examples -------- The following example uses `CuGraphStorage` : From 0ef649b19692602b437aa4b48994b619e782f631 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 20:52:05 -0500 Subject: [PATCH 25/34] rm `-W` from `sphinx-build` since too many warnings --- ci/build_docs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 5ee6b9e9cb7..46d266e4658 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -50,8 +50,8 @@ popd # Build Python docs rapids-logger "Build Sphinx docs" pushd docs/cugraph -sphinx-build -b dirhtml source _html -W -sphinx-build -b text source _text -W +sphinx-build -b dirhtml source _html +sphinx-build -b text source _text popd From 445c1eede5f7e199a431e4c7b5989381c46e7f42 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 20:54:57 -0500 Subject: [PATCH 26/34] unrelated CI fix for wheels --- python/cugraph/_custom_build/backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph/_custom_build/backend.py b/python/cugraph/_custom_build/backend.py index de3bf0a1bf1..975f153c15a 100644 --- a/python/cugraph/_custom_build/backend.py +++ b/python/cugraph/_custom_build/backend.py @@ -22,7 +22,7 @@ def wrapper(config_settings=None): cuda_suffix = os.getenv("RAPIDS_PY_WHEEL_CUDA_SUFFIX", default="") append_list = [ f"rmm{cuda_suffix}==23.4.*", - f"raft-dask{cuda_suffix}==23.4.*", + f"pylibraft{cuda_suffix}==23.4.*", f"pylibcugraph{cuda_suffix}==23.4.*", ] return orig_list + append_list From bb8b4c483678b945569219a1d8b5c0dbe31283a5 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 21:09:42 -0500 Subject: [PATCH 27/34] re-add erroneously removed final new lines --- .github/workflows/build.yaml | 2 +- .github/workflows/pr.yaml | 2 +- ci/build_docs.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e0746cdca72..fff50d8fa24 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -121,4 +121,4 @@ jobs: branch: ${{ inputs.branch }} sha: ${{ inputs.sha }} date: ${{ inputs.date }} - package-name: cugraph \ No newline at end of file + package-name: cugraph diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a4a9d677efd..87d210b4dfd 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -121,4 +121,4 @@ jobs: # On arm also need to install cupy from the specific site. test-before-arm64: "cd ./datasets && bash ./get_test_data.sh && cd - && RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-pylibcugraph-dep && pip install --no-deps ./local-pylibcugraph-dep/*.whl && pip install cupy-cuda11x -f https://pip.cupy.dev/aarch64 && pip install git+https://github.com/dask/dask.git@main git+https://github.com/dask/distributed.git@main git+https://github.com/rapidsai/dask-cuda.git@branch-23.04" test-unittest: "RAPIDS_DATASET_ROOT_DIR=/__w/cugraph/cugraph/datasets pytest -v ./python/cugraph/cugraph/tests --ignore=./python/cugraph/cugraph/tests/mg" - test-smoketest: "python ci/wheel_smoke_test_cugraph.py" \ No newline at end of file + test-smoketest: "python ci/wheel_smoke_test_cugraph.py" diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 46d266e4658..03e62e69f1a 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -10,7 +10,7 @@ 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 --force -f env.yaml -n docs conda activate docs @@ -60,4 +60,4 @@ if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then aws s3 sync --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" aws s3 sync --delete cpp/doxygen/html "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" -fi \ No newline at end of file +fi From 10c37b3932a5b1bda871bcabaa6d3cf2daf27d95 Mon Sep 17 00:00:00 2001 From: AJ Schmidt Date: Fri, 17 Feb 2023 22:21:54 -0500 Subject: [PATCH 28/34] update dependency list name --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d6aaabf212f..e943ca37d86 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -11,7 +11,7 @@ files: - common_python_test - cpp_build - cudatoolkit - - docs_build + - docs - python_build - test_notebook - test_python @@ -24,7 +24,7 @@ files: output: none includes: - cudatoolkit - - docs_build + - docs - py_version test_cpp: output: none @@ -119,7 +119,7 @@ dependencies: cuda: "11.8" packages: - nvcc_linux-aarch64=11.8 - docs_build: + docs: common: - output_types: [conda] packages: From 2e5ac819c25581738132666a90f4b264d7765b45 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Tue, 21 Feb 2023 15:25:16 -0600 Subject: [PATCH 29/34] rm redundancies --- ci/build_docs.sh | 3 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 - dependencies.yaml | 1 - 3 files changed, 5 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 03e62e69f1a..f7e7f8c0992 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -40,14 +40,11 @@ set -x rapids-mamba-retry install "${PYTHON_CHANNEL}/linux-64/cugraph-dgl-*.tar.bz2" set +x - -# Build Doxygen docs rapids-logger "Build Doxygen docs" pushd cpp/doxygen doxygen Doxyfile popd -# Build Python docs rapids-logger "Build Sphinx docs" pushd docs/cugraph sphinx-build -b dirhtml source _html diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index db0a044987b..29e0a0cc10e 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -58,7 +58,6 @@ dependencies: - sphinx-copybutton - sphinx-markdown-tables - sphinx<6 -- sphinx_rtd_theme - sphinxcontrib-websupport - ucx-proc=*=gpu - ucx-py=0.31.* diff --git a/dependencies.yaml b/dependencies.yaml index e943ca37d86..e5a0dce22d4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -130,7 +130,6 @@ dependencies: - numpydoc - pydata-sphinx-theme - recommonmark - - sphinx_rtd_theme - sphinx-copybutton - sphinx-markdown-tables - sphinx<6 From baefd2bf31b112a2c9506a2639818dbffca5b211 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Wed, 22 Feb 2023 13:01:35 -0600 Subject: [PATCH 30/34] ignore flake warning --- python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py index 2f0f6a5b04d..c876c6a14fc 100644 --- a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py +++ b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py @@ -141,7 +141,7 @@ def __init__( indices = _dgl_idx_to_cugraph_idx(indices, graph) - self.tensorized_indices_ds = create_tensorized_dataset( + self.tensorized_indices_ds = create_tensorized_dataset( # noqa: F821 indices, batch_size, drop_last, From 434b1baa0b3c32f21c9e5683dcf69b22821c3a03 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Wed, 22 Feb 2023 16:27:13 -0600 Subject: [PATCH 31/34] Revert "ignore flake warning" This reverts commit baefd2bf31b112a2c9506a2639818dbffca5b211. --- python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py index c876c6a14fc..2f0f6a5b04d 100644 --- a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py +++ b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py @@ -141,7 +141,7 @@ def __init__( indices = _dgl_idx_to_cugraph_idx(indices, graph) - self.tensorized_indices_ds = create_tensorized_dataset( # noqa: F821 + self.tensorized_indices_ds = create_tensorized_dataset( indices, batch_size, drop_last, From bbde5bec79acf41f51d8509b0f1cf7dcc918d45b Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Wed, 22 Feb 2023 16:50:55 -0600 Subject: [PATCH 32/34] dgl.dataloading fix --- python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py index 2f0f6a5b04d..4e490e36c9e 100644 --- a/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py +++ b/python/cugraph-dgl/cugraph_dgl/dataloading/dataloader.py @@ -141,7 +141,7 @@ def __init__( indices = _dgl_idx_to_cugraph_idx(indices, graph) - self.tensorized_indices_ds = create_tensorized_dataset( + self.tensorized_indices_ds = dgl.dataloading.create_tensorized_dataset( indices, batch_size, drop_last, From 7aa61c8950b4e0333e3901311a3d965623fc7f4a Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Thu, 23 Feb 2023 15:30:48 -0600 Subject: [PATCH 33/34] less verbosity --- ci/build_docs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index f7e7f8c0992..b97ed7bc268 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -54,7 +54,7 @@ popd if [[ "${RAPIDS_BUILD_TYPE}" == "branch" ]]; then rapids-logger "Upload Docs to S3" - aws s3 sync --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" - aws s3 sync --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" - aws s3 sync --delete cpp/doxygen/html "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" + aws s3 sync --no-progress --delete docs/cugraph/_html "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/html" + aws s3 sync --no-progress --delete docs/cugraph/_text "s3://rapidsai-docs/cugraph/${VERSION_NUMBER}/txt" + aws s3 sync --no-progress --delete cpp/doxygen/html "s3://rapidsai-docs/libcugraph/${VERSION_NUMBER}/html" fi From 9531f968d850ceaa319a562721ff662ea26c5c74 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Mon, 27 Feb 2023 10:47:21 -0600 Subject: [PATCH 34/34] rm set cmds --- ci/build_docs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index b97ed7bc268..ec90a0ead4b 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -36,9 +36,7 @@ rapids-mamba-retry install \ # since this package can currently only run in `11.6` CTK environments # due to the dependency version specifications in its conda recipe. rapids-logger "Install cugraph-dgl" -set -x rapids-mamba-retry install "${PYTHON_CHANNEL}/linux-64/cugraph-dgl-*.tar.bz2" -set +x rapids-logger "Build Doxygen docs" pushd cpp/doxygen