Skip to content

Commit 1194e74

Browse files
authored
Adds the latest docs code from cugraph repo (#65)
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
1 parent 2203a93 commit 1194e74

192 files changed

Lines changed: 1029 additions & 1611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pr.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
pr-builder:
1414
needs:
1515
- telemetry-setup
16+
- checks
1617
- docs-build
1718
secrets: inherit
1819
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.02
@@ -27,8 +28,15 @@ jobs:
2728
steps:
2829
- name: Telemetry setup
2930
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
30-
docs-build:
31+
checks:
32+
secrets: inherit
3133
needs: telemetry-setup
34+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.02
35+
with:
36+
enable_check_generated_files: false
37+
ignored_pr_jobs: "telemetry-summarize"
38+
docs-build:
39+
needs: checks
3240
secrets: inherit
3341
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.02
3442
with:

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
repos:
44
- repo: https://github.com/rapidsai/pre-commit-hooks
5-
rev: v0.2.0
5+
rev: v0.4.0
66
hooks:
77
- id: verify-copyright
88
- repo: https://github.com/rapidsai/dependency-file-generator
9-
rev: v1.14.0
9+
rev: v1.17.0
1010
hooks:
1111
- id: rapids-dependency-file-generator
1212
args: ["--clean"]

build.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,8 @@ if hasArg docs || buildDefault; then
101101
rm -rf "${XML_DIR}"
102102
mkdir -p "${XML_DIR}"
103103
export XML_DIR_${PROJECT^^}="$XML_DIR"
104-
105-
if [[ $PROJECT == "libcugraph" ]]; then
106-
echo "TMP (FIXME) downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}"
107-
curl -O "https://raw.githubusercontent.com/BradReesWork/data/main/xml.tar.gz"
108-
else
109-
echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}"
110-
curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
111-
fi
104+
echo "Pulling https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
105+
curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz"
112106

113107
tar -xzf xml.tar.gz -C "${XML_DIR}"
114108
rm "./xml.tar.gz"

ci/build_docs.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ for PROJECT in ${PROJ_LIST}; do
4949
rapids-logger "Download ${PROJECT} xml_tar"
5050
TMP_DIR=$(mktemp -d)
5151
export XML_DIR_${PROJECT^^}="$TMP_DIR"
52+
5253
curl "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION_MAJOR_MINOR}/xml.tar.gz" | tar -xzf - -C "${TMP_DIR}"
5354
done
5455

conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

conda/environments/all_cuda-122_arch-x86_64.yaml renamed to conda/environments/all_cuda-125_arch-x86_64.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ channels:
99
- nvidia
1010
dependencies:
1111
- breathe
12-
- cuda-version=12.2
12+
- cuda-version=12.5
1313
- cugraph-dgl==25.2.*
14+
- cugraph-pyg==25.2.*
1415
- cugraph==25.2.*
1516
- dglteam/label/th23_cu121::dgl
1617
- doxygen
@@ -27,4 +28,4 @@ dependencies:
2728
- sphinx-markdown-tables
2829
- sphinx<6
2930
- sphinxcontrib-websupport
30-
name: all_cuda-122_arch-x86_64
31+
name: all_cuda-125_arch-x86_64

dependencies.yaml

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ files:
33
all:
44
output: [conda]
55
matrix:
6-
cuda: ["11.8", "12.2"]
6+
# docs are only built on the latest CUDA version RAPIDS supports
7+
cuda: ["12.5"]
78
arch: [x86_64]
89
includes:
910
- checks
@@ -12,9 +13,9 @@ files:
1213
- depends_on_cugraph
1314
- depends_on_dgl
1415
- depends_on_cugraph_dgl
16+
- depends_on_cugraph_pyg
1517
- depends_on_pylibcugraphops
1618
- depends_on_pylibwholegraph
17-
1819
checks:
1920
output: none
2021
includes:
@@ -27,6 +28,7 @@ files:
2728
- depends_on_cugraph
2829
- depends_on_dgl
2930
- depends_on_cugraph_dgl
31+
- depends_on_cugraph_pyg
3032
- depends_on_pylibcugraphops
3133
- depends_on_pylibwholegraph
3234

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

161+
depends_on_cugraph_pyg:
162+
common:
163+
- output_types: conda
164+
packages:
165+
- &cugraph_pyg_unsuffixed cugraph-pyg==25.2.*
166+
- output_types: requirements
167+
packages:
168+
# pip recognizes the index as a global option for the requirements.txt file
169+
- --extra-index-url=https://pypi.nvidia.com
170+
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
171+
specific:
172+
- output_types: [requirements]
173+
matrices:
174+
- matrix: {cuda: "12.*"}
175+
packages:
176+
- cugraph-pyg-cu12==25.2.*
177+
- matrix: {cuda: "11.*"}
178+
packages:
179+
- cugraph-pyg-cu11==25.2.*
180+
- {matrix: null, packages: [*cugraph_pyg_unsuffixed]}
181+
159182
depends_on_dgl:
160183
specific:
161184
- output_types: [conda]
@@ -168,8 +191,6 @@ dependencies:
168191
- 'dglteam/label/th23_cu118::dgl'
169192
- {matrix: null, packages: ['dglteam/label/th23_cu121::dgl']}
170193

171-
172-
173194
depends_on_pylibcugraph:
174195
common:
175196
- output_types: conda
136 KB
Loading
74.7 KB
Loading
167 KB
Loading

0 commit comments

Comments
 (0)