-
Notifications
You must be signed in to change notification settings - Fork 310
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
Adds updates to build conda packages and CI testing for cugraph-nx
#3793
Merged
rapids-bot
merged 21 commits into
rapidsai:branch-23.10
from
rlratzel:branch-23.10-cugraph_nx_package
Aug 24, 2023
Merged
Changes from 4 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
d99c385
Adds initial (untested) updates to add conda and pip packaging for cu…
rlratzel ec8700b
Updates NetworkX dependency to >=3.0
rlratzel 179e0cb
Merge remote-tracking branch 'upstream/branch-23.10' into branch-23.1…
rlratzel 1b5cfb5
Adds conda env files that were (accidentally?) removed in a prior com…
rlratzel 156dd5e
Updates cugraph-nx test deps to add packaging, updates nx version in …
rlratzel 85f7c88
Initial update to CI scripts for new cugraph-nx packages.
rlratzel 83900a0
Adds common testing packages to cugraph-nx pip test deps.
rlratzel 3aa6826
Merge remote-tracking branch 'upstream/branch-23.10' into branch-23.1…
rlratzel 6a19b8b
Merge remote-tracking branch 'upstream/branch-23.10' into branch-23.1…
rlratzel aa765d4
Adds scipy to pylibcugraph tests deps.
rlratzel 633f397
Updates to allow tests to run using networkx >=3.0,<3.2
rlratzel 83306ec
Merge remote-tracking branch 'upstream/branch-23.10' into branch-23.1…
rlratzel 9cc09d8
Updates update-version.sh to also update cugraph-nx, adds missing dev…
rlratzel 10fd1ff
Merge remote-tracking branch 'upstream/branch-23.10' into branch-23.1…
rlratzel f42be09
Added hack to also install CUDA 11 artifacts in CUDA 12 runs so the C…
rlratzel e25a051
Merge remote-tracking branch 'upstream/branch-23.10' into branch-23.1…
rlratzel 1fcf62e
Undoes hack to install CUDA 11 artifacts in CUDA 12 test envs and ins…
rlratzel 2e70580
Fixes and clarifies comments.
rlratzel ee8b58a
Changes module path codecov uses in run_nx_tests.sh, adds comment and…
rlratzel 8108e3e
Adds scipy and pandas to common python test deps since all python pro…
rlratzel 4791948
Removes unnecessary blank lines.
rlratzel File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Copyright (c) 2023, NVIDIA CORPORATION. | ||
|
||
# This assumes the script is executed from the root of the repo directory | ||
|
||
./build.sh cugraph-nx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
# Copyright (c) 2023, NVIDIA CORPORATION. | ||
|
||
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %} | ||
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %} | ||
{% set py_version = environ['CONDA_PY'] %} | ||
{% set date_string = environ['RAPIDS_DATE_STRING'] %} | ||
|
||
package: | ||
name: cugraph-nx | ||
version: {{ version }} | ||
|
||
source: | ||
git_url: ../../.. | ||
|
||
build: | ||
number: {{ GIT_DESCRIBE_NUMBER }} | ||
build: | ||
number: {{ GIT_DESCRIBE_NUMBER }} | ||
string: py{{ py_version }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} | ||
|
||
requirements: | ||
host: | ||
- python | ||
run: | ||
- pylibcugraph ={{ version }} | ||
- networkx >=3.1 | ||
rlratzel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- cupy >=12.0.0 | ||
- python | ||
|
||
tests: | ||
imports: | ||
- cugraph_nx | ||
|
||
rlratzel marked this conversation as resolved.
Show resolved
Hide resolved
|
||
about: | ||
home: https://rapids.ai/ | ||
license: Apache-2.0 | ||
license_file: ../../../LICENSE | ||
summary: cuGraph backend for GPU-accelerated NetworkX | ||
rlratzel marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rapids-dependency-file-generator
is including both the networkx version used bycugraph-nx
, and the less-restrictive version independently used by other cugraph packages. This did not seem to be a problem when testing the env files (mamba
installed networkx version 3.1).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is fine for the solvers, and I think should be fine for us. I use this environment to develop
cugraph-nx
, so--as we discussed before--we just have to make sure the minimum nx version forcugraph-nx
is also supported by the other cugraph packages and all other packages in the environment. I don't expect this to be a nuisance.