Skip to content

Commit c712a98

Browse files
authored
remove cugraph-dgl and cugraph-pyg building/testing/publishing (#4752)
Similar to #4748, but for `cugraph-dgl` and `cugraph-pyg`. This PR removes all building, publishing, and testing code related to `cugraph-dgl` and `cugraph-pyg`. Those projects will very soon start publishing packages from https://github.com/rapidsai/cugraph-gnn instead. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Ralph Liu (https://github.com/nv-rliu) - Bradley Dice (https://github.com/bdice) URL: #4752
1 parent a5fdc8b commit c712a98

10 files changed

+3
-328
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -113,46 +113,6 @@ jobs:
113113
sha: ${{ inputs.sha }}
114114
date: ${{ inputs.date }}
115115
package-name: cugraph
116-
wheel-build-cugraph-dgl:
117-
needs: wheel-publish-cugraph
118-
secrets: inherit
119-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
120-
with:
121-
build_type: ${{ inputs.build_type || 'branch' }}
122-
branch: ${{ inputs.branch }}
123-
sha: ${{ inputs.sha }}
124-
date: ${{ inputs.date }}
125-
script: ci/build_wheel_cugraph-dgl.sh
126-
wheel-publish-cugraph-dgl:
127-
needs: wheel-build-cugraph-dgl
128-
secrets: inherit
129-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
130-
with:
131-
build_type: ${{ inputs.build_type || 'branch' }}
132-
branch: ${{ inputs.branch }}
133-
sha: ${{ inputs.sha }}
134-
date: ${{ inputs.date }}
135-
package-name: cugraph-dgl
136-
wheel-build-cugraph-pyg:
137-
needs: wheel-publish-cugraph
138-
secrets: inherit
139-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
140-
with:
141-
build_type: ${{ inputs.build_type || 'branch' }}
142-
branch: ${{ inputs.branch }}
143-
sha: ${{ inputs.sha }}
144-
date: ${{ inputs.date }}
145-
script: ci/build_wheel_cugraph-pyg.sh
146-
wheel-publish-cugraph-pyg:
147-
needs: wheel-build-cugraph-pyg
148-
secrets: inherit
149-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
150-
with:
151-
build_type: ${{ inputs.build_type || 'branch' }}
152-
branch: ${{ inputs.branch }}
153-
sha: ${{ inputs.sha }}
154-
date: ${{ inputs.date }}
155-
package-name: cugraph-pyg
156116
wheel-build-cugraph-equivariant:
157117
secrets: inherit
158118
uses: rapidsai/shared-workflows/.github/workflows/[email protected]

.github/workflows/pr.yaml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ jobs:
2525
- wheel-tests-pylibcugraph
2626
- wheel-build-cugraph
2727
- wheel-tests-cugraph
28-
- wheel-build-cugraph-dgl
29-
- wheel-tests-cugraph-dgl
30-
- wheel-build-cugraph-pyg
31-
- wheel-tests-cugraph-pyg
3228
- wheel-build-cugraph-equivariant
3329
- wheel-tests-cugraph-equivariant
3430
- devcontainer
@@ -165,38 +161,6 @@ jobs:
165161
with:
166162
build_type: pull-request
167163
script: ci/test_wheel_cugraph.sh
168-
wheel-build-cugraph-dgl:
169-
needs: wheel-tests-cugraph
170-
secrets: inherit
171-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
172-
with:
173-
build_type: pull-request
174-
script: ci/build_wheel_cugraph-dgl.sh
175-
wheel-tests-cugraph-dgl:
176-
needs: [wheel-build-cugraph-dgl, changed-files]
177-
secrets: inherit
178-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
179-
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
180-
with:
181-
build_type: pull-request
182-
script: ci/test_wheel_cugraph-dgl.sh
183-
matrix_filter: map(select(.ARCH == "amd64"))
184-
wheel-build-cugraph-pyg:
185-
needs: wheel-tests-cugraph
186-
secrets: inherit
187-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
188-
with:
189-
build_type: pull-request
190-
script: ci/build_wheel_cugraph-pyg.sh
191-
wheel-tests-cugraph-pyg:
192-
needs: [wheel-build-cugraph-pyg, changed-files]
193-
secrets: inherit
194-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
195-
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
196-
with:
197-
build_type: pull-request
198-
script: ci/test_wheel_cugraph-pyg.sh
199-
matrix_filter: map(select(.ARCH == "amd64"))
200164
wheel-build-cugraph-equivariant:
201165
secrets: inherit
202166
uses: rapidsai/shared-workflows/.github/workflows/[email protected]

.github/workflows/test.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,6 @@ jobs:
5858
date: ${{ inputs.date }}
5959
sha: ${{ inputs.sha }}
6060
script: ci/test_wheel_cugraph.sh
61-
wheel-tests-cugraph-dgl:
62-
secrets: inherit
63-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
64-
with:
65-
build_type: nightly
66-
branch: ${{ inputs.branch }}
67-
date: ${{ inputs.date }}
68-
sha: ${{ inputs.sha }}
69-
script: ci/test_wheel_cugraph-dgl.sh
70-
matrix_filter: map(select(.ARCH == "amd64"))
71-
wheel-tests-cugraph-pyg:
72-
secrets: inherit
73-
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
74-
with:
75-
build_type: nightly
76-
branch: ${{ inputs.branch }}
77-
date: ${{ inputs.date }}
78-
sha: ${{ inputs.sha }}
79-
script: ci/test_wheel_cugraph-pyg.sh
80-
matrix_filter: map(select(.ARCH == "amd64"))
8161
wheel-tests-cugraph-equivariant:
8262
secrets: inherit
8363
uses: rapidsai/shared-workflows/.github/workflows/[email protected]

ci/build_python.sh

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,29 +50,6 @@ rapids-conda-retry mambabuild \
5050
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
5151
conda/recipes/cugraph-service
5252

53-
RAPIDS_CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
54-
55-
if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
56-
# Only CUDA 11 is supported right now due to PyTorch requirement.
57-
rapids-conda-retry mambabuild \
58-
--no-test \
59-
--channel "${CPP_CHANNEL}" \
60-
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
61-
--channel pytorch \
62-
--channel pytorch-nightly \
63-
conda/recipes/cugraph-pyg
64-
65-
# Only CUDA 11 is supported right now due to PyTorch requirement.
66-
rapids-conda-retry mambabuild \
67-
--no-test \
68-
--channel "${CPP_CHANNEL}" \
69-
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
70-
--channel dglteam/label/th23_cu118 \
71-
--channel pytorch \
72-
--channel pytorch-nightly \
73-
conda/recipes/cugraph-dgl
74-
fi
75-
7653
rapids-conda-retry mambabuild \
7754
--no-test \
7855
--channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \

ci/build_wheel.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ python -m pip wheel \
3030
sccache --show-adv-stats
3131

3232
# pure-python packages should be marked as pure, and not have auditwheel run on them.
33-
if [[ ${package_name} == "cugraph-dgl" ]] || \
34-
[[ ${package_name} == "cugraph-pyg" ]] || \
35-
[[ ${package_name} == "cugraph-equivariant" ]]; then
33+
if [[ ${package_name} == "cugraph-equivariant" ]]; then
3634
RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 python dist
3735
else
3836
case "${RAPIDS_CUDA_VERSION}" in

ci/build_wheel_cugraph-dgl.sh

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

ci/build_wheel_cugraph-pyg.sh

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

ci/test_python.sh

Lines changed: 2 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -100,109 +100,12 @@ rapids-logger "pytest cugraph-service (single GPU)"
100100
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-service-coverage.xml" \
101101
--cov-report=term
102102

103-
if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
104-
if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
105-
# we are only testing in a single cuda version
106-
# because of pytorch and rapids compatibilty problems
107-
rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_dgl
108-
109-
# activate test_cugraph_dgl environment for dgl
110-
set +u
111-
conda activate test_cugraph_dgl
112-
set -u
113-
rapids-mamba-retry install \
114-
--channel "${CPP_CHANNEL}" \
115-
--channel "${PYTHON_CHANNEL}" \
116-
--channel conda-forge \
117-
--channel dglteam/label/th23_cu118 \
118-
--channel nvidia \
119-
"libcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
120-
"pylibcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
121-
"pylibcugraphops=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
122-
"cugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
123-
"cugraph-dgl=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
124-
'pytorch>=2.3,<2.4' \
125-
'cuda-version=11.8'
126-
127-
rapids-print-env
128-
129-
rapids-logger "pytest cugraph_dgl (single GPU)"
130-
./ci/run_cugraph_dgl_pytests.sh \
131-
--junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph-dgl.xml" \
132-
--cov-config=../../.coveragerc \
133-
--cov=cugraph_dgl \
134-
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-dgl-coverage.xml" \
135-
--cov-report=term
136-
137-
# Reactivate the test environment back
138-
set +u
139-
conda deactivate
140-
conda activate test
141-
set -u
142-
else
143-
rapids-logger "skipping cugraph_dgl pytest on ARM64"
144-
fi
145-
else
146-
rapids-logger "skipping cugraph_dgl pytest on CUDA!=11.8"
147-
fi
148-
149-
if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
150-
if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
151-
rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_pyg
152-
153-
# Temporarily allow unbound variables for conda activation.
154-
set +u
155-
conda activate test_cugraph_pyg
156-
set -u
157-
158-
rapids-print-env
159-
160-
# TODO re-enable logic once CUDA 12 is testable
161-
#if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
162-
CONDA_CUDA_VERSION="11.8"
163-
PYG_URL="https://data.pyg.org/whl/torch-2.3.0+cu118.html"
164-
#else
165-
# CONDA_CUDA_VERSION="12.1"
166-
# PYG_URL="https://data.pyg.org/whl/torch-2.3.0+cu121.html"
167-
#fi
168-
169-
# Will automatically install built dependencies of cuGraph-PyG
170-
rapids-mamba-retry install \
171-
--channel "${CPP_CHANNEL}" \
172-
--channel "${PYTHON_CHANNEL}" \
173-
"cugraph-pyg=${RAPIDS_VERSION_MAJOR_MINOR}.*" \
174-
"pytorch>=2.3,<2.4" \
175-
"ogb"
176-
177-
rapids-print-env
178-
179-
rapids-logger "pytest cugraph_pyg (single GPU)"
180-
# rmat is not tested because of multi-GPU testing
181-
./ci/run_cugraph_pyg_pytests.sh \
182-
--junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph-pyg.xml" \
183-
--cov-config=../../.coveragerc \
184-
--cov=cugraph_pyg \
185-
--cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-pyg-coverage.xml" \
186-
--cov-report=term
187-
188-
# Reactivate the test environment back
189-
set +u
190-
conda deactivate
191-
conda activate test
192-
set -u
193-
else
194-
rapids-logger "skipping cugraph_pyg pytest on ARM64"
195-
fi
196-
else
197-
rapids-logger "skipping cugraph_pyg pytest on CUDA!=11.8"
198-
fi
199-
200103
# test cugraph-equivariant
201104
if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
202105
if [[ "${RUNNER_ARCH}" != "ARM64" ]]; then
203-
# Reuse cugraph-dgl's test env for cugraph-equivariant
106+
rapids-mamba-retry env create --yes -f env.yaml -n test_cugraph_equivariant
204107
set +u
205-
conda activate test_cugraph_dgl
108+
conda activate test_cugraph_equivariant
206109
set -u
207110
rapids-mamba-retry install \
208111
--channel "${CPP_CHANNEL}" \

ci/test_wheel_cugraph-dgl.sh

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

ci/test_wheel_cugraph-pyg.sh

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

0 commit comments

Comments
 (0)