Skip to content

Commit

Permalink
Adds the latest docs code from cugraph repo (#65)
Browse files Browse the repository at this point in the history
Adds the latest docs code from cugraph repo also adds pyg to conda environment which is necessary to build docs.
Resolves #58

Authors:
  - Don Acosta (https://github.com/acostadon)
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)
  - James Lamb (https://github.com/jameslamb)

URL: #65
  • Loading branch information
acostadon authored Dec 18, 2024
1 parent 2203a93 commit 1194e74
Show file tree
Hide file tree
Showing 192 changed files with 1,029 additions and 1,611 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
pr-builder:
needs:
- telemetry-setup
- checks
- docs-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
Expand All @@ -27,8 +28,15 @@ jobs:
steps:
- name: Telemetry setup
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
docs-build:
checks:
secrets: inherit
needs: telemetry-setup
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
enable_check_generated_files: false
ignored_pr_jobs: "telemetry-summarize"
docs-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

repos:
- repo: https://github.com/rapidsai/pre-commit-hooks
rev: v0.2.0
rev: v0.4.0
hooks:
- id: verify-copyright
- repo: https://github.com/rapidsai/dependency-file-generator
rev: v1.14.0
rev: v1.17.0
hooks:
- id: rapids-dependency-file-generator
args: ["--clean"]
Expand Down
10 changes: 2 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,8 @@ if hasArg docs || buildDefault; then
rm -rf "${XML_DIR}"
mkdir -p "${XML_DIR}"
export XML_DIR_${PROJECT^^}="$XML_DIR"

if [[ $PROJECT == "libcugraph" ]]; then
echo "TMP (FIXME) downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}"
curl -O "https://raw.githubusercontent.com/BradReesWork/data/main/xml.tar.gz"
else
echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}"
curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
fi
echo "Pulling https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"

tar -xzf xml.tar.gz -C "${XML_DIR}"
rm "./xml.tar.gz"
Expand Down
1 change: 1 addition & 0 deletions ci/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ for PROJECT in ${PROJ_LIST}; do
rapids-logger "Download ${PROJECT} xml_tar"
TMP_DIR=$(mktemp -d)
export XML_DIR_${PROJECT^^}="$TMP_DIR"

curl "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION_MAJOR_MINOR}/xml.tar.gz" | tar -xzf - -C "${TMP_DIR}"
done

Expand Down
30 changes: 0 additions & 30 deletions conda/environments/all_cuda-118_arch-x86_64.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ channels:
- nvidia
dependencies:
- breathe
- cuda-version=12.2
- cuda-version=12.5
- cugraph-dgl==25.2.*
- cugraph-pyg==25.2.*
- cugraph==25.2.*
- dglteam/label/th23_cu121::dgl
- doxygen
Expand All @@ -27,4 +28,4 @@ dependencies:
- sphinx-markdown-tables
- sphinx<6
- sphinxcontrib-websupport
name: all_cuda-122_arch-x86_64
name: all_cuda-125_arch-x86_64
29 changes: 25 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ files:
all:
output: [conda]
matrix:
cuda: ["11.8", "12.2"]
# docs are only built on the latest CUDA version RAPIDS supports
cuda: ["12.5"]
arch: [x86_64]
includes:
- checks
Expand All @@ -12,9 +13,9 @@ files:
- depends_on_cugraph
- depends_on_dgl
- depends_on_cugraph_dgl
- depends_on_cugraph_pyg
- depends_on_pylibcugraphops
- depends_on_pylibwholegraph

checks:
output: none
includes:
Expand All @@ -27,6 +28,7 @@ files:
- depends_on_cugraph
- depends_on_dgl
- depends_on_cugraph_dgl
- depends_on_cugraph_pyg
- depends_on_pylibcugraphops
- depends_on_pylibwholegraph

Expand Down Expand Up @@ -156,6 +158,27 @@ dependencies:
- cugraph-dgl-cu11==25.2.*
- {matrix: null, packages: [*cugraph_dgl_conda]}

depends_on_cugraph_pyg:
common:
- output_types: conda
packages:
- &cugraph_pyg_unsuffixed cugraph-pyg==25.2.*
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements]
matrices:
- matrix: {cuda: "12.*"}
packages:
- cugraph-pyg-cu12==25.2.*
- matrix: {cuda: "11.*"}
packages:
- cugraph-pyg-cu11==25.2.*
- {matrix: null, packages: [*cugraph_pyg_unsuffixed]}

depends_on_dgl:
specific:
- output_types: [conda]
Expand All @@ -168,8 +191,6 @@ dependencies:
- 'dglteam/label/th23_cu118::dgl'
- {matrix: null, packages: ['dglteam/label/th23_cu121::dgl']}



depends_on_pylibcugraph:
common:
- output_types: conda
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/cugraph-docs/source/_static/colab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

46 changes: 0 additions & 46 deletions docs/cugraph-docs/source/api_docs/api/cugraph/cugraph.Graph.rst

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1194e74

Please sign in to comment.