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.08 into branch-24.10 #5979

Merged
merged 2 commits into from
Jul 26, 2024
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jul 25, 2024

Forward-merge triggered by push to branch-24.08 that creates a PR to keep branch-24.10 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.

Contributes to rapidsai/build-planning#31

In short, RAPIDS DLFW builds want to produce wheels with unsuffixed dependencies, e.g. `cudf` depending on `rmm`, not `rmm-cu12`.

This PR is part of a series across all of RAPIDS to try to support that type of build by setting up CUDA-suffixed and CUDA-unsuffixed dependency lists in `dependencies.yaml`.

For more details, see:
* rapidsai/build-planning#31 (comment)
* rapidsai/cudf#16183

## Notes for Reviewers

### Why target 24.08?

This is targeting 24.08 because:

1. it should be very low-risk
2. getting these changes into 24.08 prevents the need to carry around patches for every library in DLFW builds using RAPIDS 24.08

Authors:
  - James Lamb (https://github.com/jameslamb)

Approvers:
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: #5974
@rapids-bot rapids-bot bot requested review from a team as code owners July 25, 2024 05:12
@rapids-bot rapids-bot bot requested a review from jameslamb July 25, 2024 05:12
@github-actions github-actions bot added Cython / Python Cython or Python issue ci labels Jul 25, 2024
Copy link
Author

rapids-bot bot commented Jul 25, 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.

@jameslamb jameslamb self-assigned this Jul 25, 2024
@jameslamb
Copy link
Member

Unable to forward-merge due to an error, manual merge is necessary

I'll fix this.

@jameslamb
Copy link
Member

Put up #5981 fixing the conflicts here

This fixes a call to `raft::stats::mean()` deactivating the sample parameter in the pca code. 

CC @dantegd

Authors:
  - Malte Förster (https://github.com/mfoerste4)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Dante Gama Dessavre (https://github.com/dantegd)
  - Corey J. Nolet (https://github.com/cjnolet)

URL: #5980
@rapids-bot rapids-bot bot requested a review from a team as a code owner July 26, 2024 03:55
@AyodeAwe AyodeAwe merged commit 8f15658 into branch-24.10 Jul 26, 2024
101 of 114 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci CUDA/C++ Cython / Python Cython or Python issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants