Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update handling of GNN dependencies #4947

Merged
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
1 change: 0 additions & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ NEXT_UCXX_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; p
DEPENDENCIES=(
cudf
cugraph
cugraph-dgl
cugraph-pyg
cugraph-service-server
cugraph-service-client
Expand Down
54 changes: 41 additions & 13 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,9 @@ files:
- depends_on_libcugraph
- depends_on_pylibcugraph
- depends_on_cugraph
- depends_on_cugraph_pyg
- depends_on_cugraph_dgl
- depends_on_cugraph_service_server
- depends_on_cugraph_service_client
- depends_on_libcugraph_etl
- depends_on_pylibwholegraph
- depends_on_pytorch
test_cpp:
output: none
Expand Down Expand Up @@ -224,6 +221,18 @@ files:
table: project
includes:
- python_run_cugraph_service_client
py_test_cugraph_service_client:
output: pyproject
pyproject_dir: python/cugraph-service/client
extras:
table: project.optional-dependencies
key: test
includes:
- depends_on_cudf
- depends_on_cugraph_pyg
- depends_on_cupy
- test_python_common
- test_python_cugraph_service_client
py_build_cugraph_service_server:
output: pyproject
pyproject_dir: python/cugraph-service/server
Expand Down Expand Up @@ -484,7 +493,7 @@ dependencies:
common:
- output_types: [conda, pyproject]
packages:
- pandas
- &pandas pandas
- pytest
- pytest-benchmark
- pytest-cov
Expand All @@ -502,14 +511,20 @@ dependencies:
- output_types: [conda]
packages:
- *thrift
test_python_cugraph_service_client:
common:
- output_types: [conda, pyproject, requirements]
packages:
- *numpy
- *pandas
test_python_cugraph_service_server:
common:
- output_types: [conda, pyproject]
- output_types: [conda, pyproject, requirements]
packages:
- *numpy
test_python_pylibcugraph:
common:
- output_types: [conda, pyproject]
- output_types: [conda, pyproject, requirements]
packages:
- *numpy

Expand Down Expand Up @@ -538,17 +553,30 @@ dependencies:
- cugraph-cu11==25.4.*,>=0.0.0a0
- {matrix: null, packages: [*cugraph_unsuffixed]}

depends_on_cugraph_dgl:
common:
- output_types: conda
packages:
- cugraph-dgl==25.4.*,>=0.0.0a0

depends_on_cugraph_pyg:
common:
- output_types: conda
packages:
- cugraph-pyg==25.4.*,>=0.0.0a0
- &cugraph_pyg_unsuffixed cugraph-pyg==25.4.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- cugraph-pyg-cu12==25.4.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- cugraph-pyg-cu11==25.4.*,>=0.0.0a0
- {matrix: null, packages: [*cugraph_pyg_unsuffixed]}

depends_on_cugraph_service_client:
common:
Expand Down
14 changes: 14 additions & 0 deletions python/cugraph-service/client/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ classifiers = [
Homepage = "https://github.com/rapidsai/cugraph"
Documentation = "https://docs.rapids.ai/api/cugraph/stable/"


[project.optional-dependencies]
test = [
"cudf==25.4.*,>=0.0.0a0",
"cugraph-pyg==25.4.*,>=0.0.0a0",
"cupy-cuda11x>=12.0.0",
"numpy>=1.23,<3.0a0",
"pandas",
"pytest",
"pytest-benchmark",
"pytest-cov",
"pytest-xdist",
"scipy",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../../dependencies.yaml and run `rapids-dependency-file-generator`.
[tool.setuptools]
license-files = ["LICENSE"]

Expand Down
Loading