Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,6 @@ jobs:
with:
build_type: pull-request
script: ci/test_python.sh
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
matrix_filter: map(select(.GPU != "rtxpro6000"))
conda-notebook-tests:
needs: [conda-python-build, changed-files]
secrets: inherit
Expand Down Expand Up @@ -335,8 +333,6 @@ jobs:
with:
build_type: pull-request
script: ci/test_wheel_cugraph.sh
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
matrix_filter: map(select(.GPU != "rtxpro6000"))
devcontainer:
secrets: inherit
needs: telemetry-setup
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ jobs:
date: ${{ inputs.date }}
script: ci/test_python.sh
sha: ${{ inputs.sha }}
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
matrix_filter: map(select(.GPU != "rtxpro6000"))
wheel-tests-pylibcugraph:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@release/26.04
Expand All @@ -70,5 +68,3 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
script: ci/test_wheel_cugraph.sh
# Skip failing tests on RTX PRO 6000 (Blackwell). xref: https://github.com/rapidsai/cugraph/issues/5421
matrix_filter: map(select(.GPU != "rtxpro6000"))
38 changes: 38 additions & 0 deletions ci/download-torch-wheels.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/bin/bash
# SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

# [description]
#
# Downloads a CUDA variant of 'torch' from the correct index, based on CUDA major version.
#
# This exists to avoid using 'pip --extra-index-url', which could allow for CPU-only 'torch'
# to be downloaded from pypi.org.
#

set -e -u -o pipefail

TORCH_WHEEL_DIR="${1}"

# Ensure CUDA-enabled 'torch' packages are always used.
#
# Downloading + passing the downloaded file as a requirement forces the use of this
# package, so we don't accidentally end up with a CPU-only 'torch' from 'pypi.org'
# (which can happen because pip doesn't support index priority).
#
# Not appending this to PIP_CONSTRAINT, because we don't want the torch '--extra-index-url'
# to leak outside of this script into other 'pip {download,install}' calls.
rapids-dependency-file-generator \
--output requirements \
--file-key "torch_only" \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES};require_gpu=true" \
| tee ./torch-constraints.txt

rapids-pip-retry download \
--isolated \
--prefer-binary \
--no-deps \
-d "${TORCH_WHEEL_DIR}" \
--constraint "${PIP_CONSTRAINT}" \
--constraint ./torch-constraints.txt \
'torch'
2 changes: 1 addition & 1 deletion ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rapids-logger "Generate Python testing dependencies"
rapids-dependency-file-generator \
--output conda \
--file-key test_python \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
--matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION};dependencies=${RAPIDS_DEPENDENCIES};require_gpu=true" \
--prepend-channel "${CPP_CHANNEL}" \
--prepend-channel "${PYTHON_CHANNEL}" \
| tee env.yaml
Expand Down
48 changes: 46 additions & 2 deletions ci/test_wheel_cugraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,54 @@ PYLIBCUGRAPH_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wh
CUGRAPH_WHEELHOUSE=$(rapids-download-from-github "$(rapids-package-name "wheel_python" cugraph --stable --cuda "$RAPIDS_CUDA_VERSION")")
LIBCUGRAPH_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcugraph_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp)

# echo to expand wildcard before adding `[extra]` requires for pip
# generate constraints (possibly pinning to oldest support versions of dependencies)
rapids-generate-pip-constraints test_python "${PIP_CONSTRAINT}"

# Update this when 'torch' publishes CUDA wheels supporting newer CTKs.
#
# See notes in 'dependencies.yaml' for details on supported versions.
CUDA_MAJOR=$(echo "${RAPIDS_CUDA_VERSION}" | cut -d'.' -f1)
CUDA_MINOR=$(echo "${RAPIDS_CUDA_VERSION}" | cut -d'.' -f2)
PIP_INSTALL_ARGS=()
torch_downloaded=false
if \
{ [ "${CUDA_MAJOR}" -eq 12 ] && [ "${CUDA_MINOR}" -eq 9 ]; } \
|| { [ "${CUDA_MAJOR}" -eq 13 ] && [ "${CUDA_MINOR}" -eq 0 ]; }; \
then
# ensure a CUDA variant of 'torch' is used
rapids-logger "Downloading PyTorch CUDA wheels"
TORCH_WHEEL_DIR="$(mktemp -d)"
./ci/download-torch-wheels.sh "${TORCH_WHEEL_DIR}"
PIP_INSTALL_ARGS+=("${TORCH_WHEEL_DIR}"/torch*.whl)
torch_downloaded=true
fi

# notes:
#
# * echo to expand wildcard before adding `[test]` requires for pip
# * just providing --constraint="${PIP_CONSTRAINT}" to be explicit, and because
# that environment variable is ignored if any other --constraint are passed via the CLI
#
rapids-pip-retry install \
--prefer-binary \
--constraint "${PIP_CONSTRAINT}" \
"$(echo "${CUGRAPH_WHEELHOUSE}"/cugraph*.whl)[test]" \
"${PYLIBCUGRAPH_WHEELHOUSE}"/pylibcugraph*.whl \
"${LIBCUGRAPH_WHEELHOUSE}"/libcugraph*.whl
"${LIBCUGRAPH_WHEELHOUSE}"/libcugraph*.whl \
"${PIP_INSTALL_ARGS[@]}"

# TODO: remove this when RAPIDS wheels and 'torch' CUDA wheels have compatible package requirements
#
# * https://github.com/rapidsai/cugraph/issues/5443
# * https://github.com/rapidsai/build-planning/issues/257
# * https://github.com/rapidsai/build-planning/issues/255
#
CUDA_MAJOR="${RAPIDS_CUDA_VERSION%%.*}"
CUDA_MINOR=$(echo "${RAPIDS_CUDA_VERSION}" | cut -d'.' -f2)
if [[ "${CUDA_MAJOR}" == "13" ]] && [[ "${torch_downloaded}" == "true" ]]; then
pip install \
--upgrade \
"nvidia-nvjitlink>=${CUDA_MAJOR}.${CUDA_MINOR}"
fi

./ci/test_wheel.sh cugraph
6 changes: 1 addition & 5 deletions conda/environments/all_cuda-129_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@ dependencies:
- numba>=0.60.0,<0.65.0
- numpy>=1.23,<3.0
- numpydoc
- ogb
- openmpi
- packaging
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pylibcudf==26.4.*,>=0.0.0a0
- pylibraft==26.4.*,>=0.0.0a0
Expand All @@ -56,7 +54,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- python-louvain
- pytorch>=2.3
- pytorch>=2.4.1
- raft-dask==26.4.*,>=0.0.0a0
- rapids-build-backend>=0.4.0,<0.5.0
- rapids-dask-dependency==26.4.*,>=0.0.0a0
Expand All @@ -71,8 +69,6 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinxcontrib-websupport
- torchdata
- torchmetrics
- ucxx==0.49.*,>=0.0.0a0
- wheel
name: all_cuda-129_arch-aarch64
6 changes: 1 addition & 5 deletions conda/environments/all_cuda-129_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@ dependencies:
- numba>=0.60.0,<0.65.0
- numpy>=1.23,<3.0
- numpydoc
- ogb
- openmpi
- packaging
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pylibcudf==26.4.*,>=0.0.0a0
- pylibraft==26.4.*,>=0.0.0a0
Expand All @@ -56,7 +54,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- python-louvain
- pytorch>=2.3
- pytorch>=2.4.1
- raft-dask==26.4.*,>=0.0.0a0
- rapids-build-backend>=0.4.0,<0.5.0
- rapids-dask-dependency==26.4.*,>=0.0.0a0
Expand All @@ -71,8 +69,6 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinxcontrib-websupport
- torchdata
- torchmetrics
- ucxx==0.49.*,>=0.0.0a0
- wheel
name: all_cuda-129_arch-x86_64
6 changes: 1 addition & 5 deletions conda/environments/all_cuda-131_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ dependencies:
- numba>=0.60.0,<0.65.0
- numpy>=1.23,<3.0
- numpydoc
- ogb
- openmpi
- packaging
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pylibcudf==26.4.*,>=0.0.0a0
- pylibraft==26.4.*,>=0.0.0a0
Expand All @@ -57,7 +55,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- python-louvain
- pytorch>=2.3
- pytorch>=2.4.1
- raft-dask==26.4.*,>=0.0.0a0
- rapids-build-backend>=0.4.0,<0.5.0
- rapids-dask-dependency==26.4.*,>=0.0.0a0
Expand All @@ -72,8 +70,6 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinxcontrib-websupport
- torchdata
- torchmetrics
- ucxx==0.49.*,>=0.0.0a0
- wheel
name: all_cuda-131_arch-aarch64
6 changes: 1 addition & 5 deletions conda/environments/all_cuda-131_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ dependencies:
- numba>=0.60.0,<0.65.0
- numpy>=1.23,<3.0
- numpydoc
- ogb
- openmpi
- packaging
- pandas
- pre-commit
- pydantic
- pydata-sphinx-theme
- pylibcudf==26.4.*,>=0.0.0a0
- pylibraft==26.4.*,>=0.0.0a0
Expand All @@ -57,7 +55,7 @@ dependencies:
- pytest-cov
- pytest-xdist
- python-louvain
- pytorch>=2.3
- pytorch>=2.4.1
- raft-dask==26.4.*,>=0.0.0a0
- rapids-build-backend>=0.4.0,<0.5.0
- rapids-dask-dependency==26.4.*,>=0.0.0a0
Expand All @@ -72,8 +70,6 @@ dependencies:
- sphinx-copybutton
- sphinx-markdown-tables
- sphinxcontrib-websupport
- torchdata
- torchmetrics
- ucxx==0.49.*,>=0.0.0a0
- wheel
name: all_cuda-131_arch-x86_64
4 changes: 3 additions & 1 deletion cpp/src/c_api/ecg.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright (c) 2022-2025, NVIDIA CORPORATION.
* SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
* SPDX-License-Identifier: Apache-2.0
*/

Expand Down Expand Up @@ -46,6 +46,8 @@ struct ecg_functor : public cugraph::c_api::abstract_functor {
handle_(*reinterpret_cast<cugraph::c_api::cugraph_resource_handle_t const*>(handle)->handle_),
rng_state_(reinterpret_cast<cugraph::c_api::cugraph_rng_state_t*>(rng_state)),
graph_(reinterpret_cast<cugraph::c_api::cugraph_graph_t*>(graph)),
min_weight_(min_weight),
ensemble_size_(ensemble_size),
max_level_(max_level),
threshold_(threshold),
resolution_(resolution),
Expand Down
Loading
Loading