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

Forward-merge branch-25.02 into branch-25.04 #626

Merged
merged 4 commits into from
Feb 10, 2025
Merged

Forward-merge branch-25.02 into branch-25.04 #626

merged 4 commits into from
Feb 10, 2025
+20 −17

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Feb 7, 2025

Manual forward merge from 25.02 to 25.04. This PR should not be squashed.

madsbk and others added 4 commits February 5, 2025 11:48
@madsbk
Use std::string (rapidsai#617)
6b316e6 
Minor maintenance

Authors:
  - Mads R. B. Kristensen (https://github.com/madsbk)

Approvers:
  - https://github.com/jakirkham

URL: rapidsai#617
@gforsyth
Use rapids-pip-retry in CI jobs that might need retries (rapidsai#619)
b5758ec 
Uses a retry wrapper for `pip` commands to try to alleviate CI failures due to hash mismatches that result from network hiccups

xref rapidsai/build-planning#148

This will retry failures that show up in CI like:

```
   Collecting nvidia-cublas-cu12 (from libraft-cu12==25.2.*,>=0.0.0a0)
    Downloading https://pypi.nvidia.com/nvidia-cublas-cu12/nvidia_cublas_cu12-12.8.3.14-py3-none-manylinux_2_27_aarch64.whl (604.9 MB)
       ━━━━━━━━━━━━━━━━━━━━━                 350.2/604.9 MB 229.2 MB/s eta 0:00:02
  ERROR: THESE PACKAGES DO NOT MATCH THE HASHES FROM THE REQUIREMENTS FILE. If you have updated the package versions, please update the hashes. Otherwise, examine the package contents carefully; someone may have tampered with them.
      nvidia-cublas-cu12 from https://pypi.nvidia.com/nvidia-cublas-cu12/nvidia_cublas_cu12-12.8.3.14-py3-none-manylinux_2_27_aarch64.whl#sha256=93a4e0e386cc7f6e56c822531396de8170ed17068a1e18f987574895044cd8c3 (from libraft-cu12==25.2.*,>=0.0.0a0):
          Expected sha256 93a4e0e386cc7f6e56c822531396de8170ed17068a1e18f987574895044cd8c3
               Got        849c88d155cb4b4a3fdfebff9270fb367c58370b4243a2bdbcb1b9e7e940b7be
```

Authors:
  - Gil Forsyth (https://github.com/gforsyth)

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

URL: rapidsai#619
@KyleFromNVIDIA
Set POSITION_INDEPENDENT_CODE on libcurl (rapidsai#625)
54b78bd 
Also don't export the curl dependency.

Authors:
  - Kyle Edwards (https://github.com/KyleFromNVIDIA)

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

URL: rapidsai#625
@bdice
Merge branch-25.02 into branch-25.04
31f4af8
@bdice bdice added the improvement Improves an existing functionality label Feb 7, 2025
@bdice bdice requested a review from a team as a code owner February 7, 2025 17:31
@bdice bdice added the non-breaking Introduces a non-breaking change label Feb 7, 2025
@bdice bdice requested review from a team as code owners February 7, 2025 17:31
@bdice bdice requested a review from AyodeAwe February 7, 2025 17:31
@bdice
Copy link
Contributor Author

bdice commented Feb 7, 2025 •
edited
Loading

@madsbk @tingyu66 Can you verify that I did the forward-merge properly for your conflicting PRs #594 and #617? If it looks alright, we will need to request a non-squash forward merge from ops.

KyleFromNVIDIA
KyleFromNVIDIA approved these changes Feb 7, 2025
View reviewed changes
Copy link
Contributor

@KyleFromNVIDIA KyleFromNVIDIA left a comment

Choose a reason for hiding this comment

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

Me approving the changes I made in #625:

image

@TomAugspurger TomAugspurger mentioned this pull request Feb 7, 2025
Open
@raydouglass raydouglass merged commit c38038e into rapidsai:branch-25.04 Feb 10, 2025
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KyleFromNVIDIA KyleFromNVIDIA KyleFromNVIDIA approved these changes

@AyodeAwe AyodeAwe Awaiting requested review from AyodeAwe AyodeAwe is a code owner automatically assigned from rapidsai/ci-codeowners

Assignees
No one assigned
Labels
improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bdice @KyleFromNVIDIA @raydouglass @madsbk @gforsyth