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

Forward-merge branch-24.12 into branch-25.02 #423

Open
wants to merge 2 commits into
base: branch-25.02
Choose a base branch
from

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Nov 19, 2024

Forward-merge triggered by push to branch-24.12 that creates a PR to keep branch-25.02 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

eriknw and others added 2 commits November 15, 2024 09:27
I believe this is needed to remove `nx-cugraph` from the `cugraph` repo
being done in rapidsai/cugraph#4756

This is a subset of the changes @jameslamb is making in
#417. Does it make sense
to do this change for `nx-cugraph` and `cugraph-gnn` independently (how
close is `cugraph-gnn` to being removed?)? Should we also add
`nx-cugraph` as done in that PR? Anything else?

@nv-rliu @jameslamb @rlratzel
Development of some `cugraph` projects is moving in 24.12.

```text
# GNN packages
cugraph-dgl: rapidsai/cugraph -> rapidsai/cugraph-gnn
cugraph-pyg: rapidsai/cugraph -> rapidsai/cugraph-gnn
wholegraph: rapidsai/wholegraph -> rapidsai/cugraph-gnn

# networkx
nx-cugraph: rapidsai/cugraph -> rapidsai/nx-cugraph

# other
cugraph-equivariant -> (removed)
```

This updates the `rapids-build-utils` manifest to reflect those changes.

## Notes for Reviewers

The `nx-cugraph` changes ended up getting split off into their own PR:
#418

---------

Co-authored-by: Kyle Edwards <[email protected]>
@rapids-bot rapids-bot bot requested a review from a team as a code owner November 19, 2024 06:01
@rapids-bot rapids-bot bot requested review from bdice and removed request for a team November 19, 2024 06:01
Copy link
Author

rapids-bot bot commented Nov 19, 2024

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants