Skip to content

Main merge release/26.04#5478

Open
ChuckHastings wants to merge 4 commits intorapidsai:mainfrom
ChuckHastings:main-merge-release/26.04
Open

Main merge release/26.04#5478
ChuckHastings wants to merge 4 commits intorapidsai:mainfrom
ChuckHastings:main-merge-release/26.04

Conversation

@ChuckHastings
Copy link
Copy Markdown
Collaborator

Resolve auto merger failures

ChuckHastings and others added 2 commits March 26, 2026 04:07
This PR adds the disjoint sampling feature to sampling in C++.  C++ tests exist for homogeneous uniform and biased sampling, both for SG and MG.

This should get us started on the disjoint feature, we can add tests for heterogeneous and temporal variations as well, I plan to do that in a follow on activity.  We also need to test that the C API level, which I will add to a later pull request.

Authors:
  - Chuck Hastings (https://github.com/ChuckHastings)

Approvers:
  - Seunghwa Kang (https://github.com/seunghwak)

URL: rapidsai#5414
@ChuckHastings ChuckHastings requested review from a team as code owners March 30, 2026 19:41
@ChuckHastings ChuckHastings added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Mar 30, 2026
@ChuckHastings
Copy link
Copy Markdown
Collaborator Author

/merge nosquash

Copy link
Copy Markdown
Contributor

@seunghwak seunghwak left a comment

Choose a reason for hiding this comment

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

LGTM

@jameslamb
Copy link
Copy Markdown
Member

This branch should only have the commits to be forward-merged (#5476) + exactly 1 commit fixing conflicts.

I think the easiest way to fix this will be to recreate this PR branch. Assuming you have your fork as origin and rapidsai/cugraph as upstream, something like:

git checkout release/26.04
git pull upstream release/26.04
git checkout main
git pull upstream main
git branch -D main-merge-release/26.04

git checkout -b main-merge-release/26.04
git merge --no-squash release/26.04

# (manually resolve conflicts), then ...
git push origin main-merge-release/26.04 --force

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

improvement Improvement / enhancement to an existing function non-breaking Non-breaking change

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants