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-25.02 into branch-25.04 #454

Merged
merged 5 commits into from
Jan 29, 2025
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jan 27, 2025

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

We now require CUDA 12.5+ to build RAPIDS in conda environments, for a
few reasons:
- We only build libraries with CUDA 12.5+ in CI (and test on older
versions via CUDA compatibility), so CUDA 12.0 and 12.2 would only be
tested in this repo's CI
- We need CUDA 12.5+ to ensure alignment between the `conda-forge` and
`nvidia` channels
- We need CUDA 12.4+ to ensure support for GCC 13, which is what we use
in our CUDA 12 conda environments

Therefore, we drop CUDA 12.0 and 12.2 devcontainers.

I dropped the pip devcontainers too, because I don't see a great reason
to keep them if we are deleting the corresponding conda devcontainers.
@rapids-bot rapids-bot bot requested a review from a team as a code owner January 27, 2025 22:47
@rapids-bot rapids-bot bot requested review from jameslamb and removed request for a team January 27, 2025 22:47
Copy link
Author

rapids-bot bot commented Jan 27, 2025

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.

bdice and others added 4 commits January 28, 2025 13:25
Backporting the following:
- Switch to miniforge (#448)
- Fix activation script name (#456)

---------

Co-authored-by: Paul Taylor <[email protected]>
Co-authored-by: Vyas Ramasubramani <[email protected]>
Adds 12.8 and 12.6 to the CUDA feature.

xref: rapidsai/build-planning#139
This adds unified RAPIDS devcontainers for CUDA 12.8.

xref: rapidsai/build-planning#139

---------

Co-authored-by: Paul Taylor <[email protected]>
@trxcllnt trxcllnt merged commit 5f323f1 into branch-25.04 Jan 29, 2025
170 checks passed
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