Skip to content

Commit

Permalink
Correct cugraph-pyg package name used in wheels and fix test script (
Browse files Browse the repository at this point in the history
…#4083)

This is an oversight from #4075. With this fix, the generated wheels should have proper a CUDA suffix (e.g. `cugraph-pyg-cu12`).

Edit: This PR also fixes rapidsai/graph_dl#421 
The mg tests were not skipped as expected due to wrong relative path in `test_wheel_cugraph-pyg.sh`.

Authors:
  - Tingyu Wang (https://github.com/tingyu66)

Approvers:
  - Ray Douglass (https://github.com/raydouglass)
  - Alex Barghi (https://github.com/alexbarghi-nv)

URL: #4083
  • Loading branch information
tingyu66 authored Jan 10, 2024
1 parent ae25ea1 commit 35ae8ef
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
3 changes: 1 addition & 2 deletions ci/test_python.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.

set -euo pipefail

Expand Down Expand Up @@ -230,7 +230,6 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
# rmat is not tested because of multi-GPU testing
pytest \
--cache-clear \
--ignore=tests/int \
--ignore=tests/mg \
--junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph-pyg.xml" \
--cov-config=../../.coveragerc \
Expand Down
5 changes: 3 additions & 2 deletions ci/test_wheel_cugraph-pyg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ if [[ "${CUDA_VERSION}" == "11.8.0" ]]; then
-f https://data.pyg.org/whl/torch-2.1.0+cu118.html

rapids-logger "pytest cugraph-pyg (single GPU)"
pushd python/cugraph-pyg/cugraph_pyg
python -m pytest \
--cache-clear \
--ignore=tests/int \
--ignore=tests/mg \
python/cugraph-pyg/cugraph_pyg/tests
tests
popd
else
rapids-logger "skipping cugraph-pyg wheel test on CUDA!=11.8"
fi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand Down Expand Up @@ -385,7 +385,7 @@ def test_get_input_nodes(karate_gnn, dask_client):
def test_mg_frame_handle(graph, dask_client):
F, G, N = graph
cugraph_store = CuGraphStore(F, G, N, multi_gpu=True)
assert isinstance(cugraph_store._EXPERIMENTAL__CuGraphStore__graph._plc_graph, dict)
assert isinstance(cugraph_store._CuGraphStore__graph._plc_graph, dict)


@pytest.mark.skipif(isinstance(torch, MissingModule), reason="torch not available")
Expand Down
4 changes: 2 additions & 2 deletions python/cugraph-pyg/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ requires = [
testpaths = ["cugraph_pyg/tests"]

[project]
name = "cugraph_pyg"
name = "cugraph-pyg"
dynamic = ["version"]
description = "cugraph_pyg - PyG support for cuGraph massive-scale, ultra-fast GPU graph analytics."
description = "cugraph-pyg - PyG support for cuGraph massive-scale, ultra-fast GPU graph analytics."
authors = [
{ name = "NVIDIA Corporation" },
]
Expand Down

0 comments on commit 35ae8ef

Please sign in to comment.