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.

Sign up for GitHub

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

Jump to bottom

Merge branch-24.08 into branch-24.10 #1368

Merged
merged 3 commits into from
Jul 25, 2024
Merged

Merge branch-24.08 into branch-24.10 #1368

merged 3 commits into from
Jul 25, 2024

Commits on Jul 24, 2024

  1. split up CUDA-suffixed dependencies in dependencies.yaml (rapidsai#1364) 

    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:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

URL: rapidsai#1364
    @jameslamb
    jameslamb authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    13a5f47 View commit details
    Browse the repository at this point in the history

  2. consolidate cuda_suffixed=false blocks in dependencies.yaml, fix upda… 

    …te-version.sh (rapidsai#1367)

Contributes to rapidsai/build-planning#31.

Follow-up to rapidsai#1364.

Implements some of the suggestions made in rapidsai/cudf#16183 (after rapidsai#1364 was already merged):

* removing `cuda_suffixed: "false"` blocks in `dependencies.yaml` wherever they're identical to each other and the fallback matrix
* changing `dependencies.yaml` anchors with names like `*_conda` to `*_unsuffixed`, to reflect the fact that they're not conda-specific
* checking that `update-version.sh` catches all changes to versions

## Notes for Reviewers

### How I tested this

Looked for `update-versions.sh` issues manually like this:

```shell
git fetch upstream --tags
ci/release/update-version.sh '24.10.0'
git grep -E '24\.8|24\.08|0\.39'
```

The did find a few problems (like UCX dependency versions not being updated). This fixes those issues.

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

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

URL: rapidsai#1367
    @jameslamb
    jameslamb authored Jul 24, 2024
    Configuration menu
    Copy the full SHA
    064e254 View commit details
    Browse the repository at this point in the history

  3. Merge branch-24.08 into branch-24.10

    @jameslamb
    jameslamb committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    c5d57e6 View commit details
    Browse the repository at this point in the history