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

Merge branch-24.08 into branch-24.10 #1631

Merged
merged 2 commits into from
Jul 25, 2024

Conversation

jameslamb
Copy link
Member

Description

Replaces #1630

Fixes conflicts in forward-merger, following the steps from https://docs.rapids.ai/maintainers/forward-merger/.

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

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: rapidsai#1627
@jameslamb jameslamb added non-breaking Non-breaking change improvement Improvement / enhancement to an existing function labels Jul 24, 2024
@jameslamb jameslamb requested a review from a team as a code owner July 24, 2024 23:42
@jameslamb jameslamb requested a review from msarahan July 24, 2024 23:42
@github-actions github-actions bot added the Python Related to RMM Python API label Jul 24, 2024
@AyodeAwe AyodeAwe merged commit c825e4c into rapidsai:branch-24.10 Jul 25, 2024
61 checks passed
@jameslamb jameslamb deleted the branch-24.10-merge-24.08 branch July 25, 2024 13:31
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 Python Related to RMM Python API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants