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: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ jobs:
with:
build_type: pull-request
script: ci/test_wheel_pylibwholegraph.sh
matrix_filter: map(select(.PY_VER != "3.14")) | map(select(.ARCH == "amd64"))
matrix_filter: map(select(.PY_VER != "3.14"))
wheel-build-cugraph-pyg:
needs: checks
secrets: inherit
Expand All @@ -279,4 +279,4 @@ jobs:
with:
build_type: pull-request
script: ci/test_wheel_cugraph-pyg.sh
matrix_filter: map(select(.PY_VER != "3.14")) | map(select(.ARCH == "amd64"))
matrix_filter: map(select(.PY_VER != "3.14"))
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
script: ci/test_wheel_pylibwholegraph.sh
matrix_filter: map(select(.PY_VER != "3.14")) | map(select(.ARCH == "amd64"))
matrix_filter: map(select(.PY_VER != "3.14"))
wheel-tests-cugraph-pyg:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
Expand All @@ -63,4 +63,4 @@ jobs:
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
script: ci/test_wheel_cugraph-pyg.sh
matrix_filter: map(select(.PY_VER != "3.14")) | map(select(.ARCH == "amd64"))
matrix_filter: map(select(.PY_VER != "3.14"))
17 changes: 12 additions & 5 deletions ci/test_wheel_cugraph-pyg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,29 @@ rapids-pip-retry install \

# RAPIDS_DATASET_ROOT_DIR is used by test scripts
export RAPIDS_DATASET_ROOT_DIR="$(realpath datasets)"
mkdir -p "${RAPIDS_DATASET_ROOT_DIR}"
pushd "${RAPIDS_DATASET_ROOT_DIR}"
./get_test_data.sh --test
popd

# Enable legacy behavior of torch.load for examples relying on ogb
export TORCH_FORCE_NO_WEIGHTS_ONLY_LOAD=1

if [[ "${torch_downloaded}" == "true" ]]; then

# only need to download datasets if 'torch' is installed, otherwise all the
# tests using them are skipped
mkdir -p "${RAPIDS_DATASET_ROOT_DIR}"
pushd "${RAPIDS_DATASET_ROOT_DIR}"
./get_test_data.sh --test
popd

# 'torch' is an optional dependency of 'cugraph-pyg'... confirm that it's actually
# installed here and that we've installed a package with CUDA support.
rapids-logger "Confirming that PyTorch is installed"
python -c "import torch; assert torch.cuda.is_available()"

rapids-logger "pytest cugraph-pyg (single GPU, with 'torch' and 'torch-geometric')"
./ci/run_cugraph_pyg_pytests.sh
./ci/run_cugraph_pyg_pytests.sh \
--cov-config=../../.coveragerc \
--cov=cugraph_pyg \
--cov-fail-under=70
fi

rapids-logger "import cugraph-pyg (no 'torch' or 'torch-geometric')"
Expand Down
5 changes: 4 additions & 1 deletion ci/test_wheel_pylibwholegraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ if [[ "${torch_downloaded}" == "true" ]]; then
python -c "import torch; assert torch.cuda.is_available()"

rapids-logger "pytest pylibwholegraph (with 'torch')"
./ci/run_pylibwholegraph_pytests.sh
./ci/run_pylibwholegraph_pytests.sh \
--cov-config=../../.coveragerc \
--cov=pylibwholegraph \
--cov-fail-under=15
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm proposing this because of all the test-skipping stuff added in #425 and #434 ... all that test-skipping logic makes me nervous.

Hoping that having a coverage minimum enforced right here, in a place where we expect torch to be installed, will help prevent bugs of the form "oops all the tests are being skipped" when the fixtures, import_optional(), etc. are refactored in the future.

fi

rapids-logger "import pylibwholegraph (no 'torch')"
Expand Down
10 changes: 10 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,21 @@ dependencies:
packages:
# matrices below ensure CUDA 'torch' packages are used
- matrix:
arch: aarch64
cuda: "12.9"
dependencies: "oldest"
require_gpu: "true"
packages:
- &torch_cu129_index --extra-index-url=https://download.pytorch.org/whl/cu129
# 'triton' didn't have aarch64 wheels until v3.5.0 and 'torch==2.8.0' pins to 'triton==3.4.0'...
# so need to depend on a slightly newer 'torch' for the oldest-deps configuration on aarch64
- torch==2.9.0+cu129
- matrix:
cuda: "12.9"
dependencies: "oldest"
require_gpu: "true"
packages:
- *torch_cu129_index
- torch==2.8.0+cu129
- matrix:
cuda: "12.9"
Expand Down
12 changes: 12 additions & 0 deletions python/cugraph-pyg/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ requires = [
build-backend = "rapids_build_backend.build"

[tool.pytest.ini_options]
addopts = [
"--benchmark-warmup=off",
"--benchmark-max-time=0",
"--benchmark-min-rounds=1",
"--benchmark-columns=mean,rounds",
"-m", "not slow"
]
markers = [
"slow: slow-running tests/benchmarks",
"mg: Test MG code paths - number of gpu > 1",
"sg: Test SG code paths - number of gpu == 1",
]
testpaths = ["cugraph_pyg/tests"]

[project]
Expand Down
28 changes: 0 additions & 28 deletions python/cugraph-pyg/pytest.ini

This file was deleted.

Loading