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.12 into branch-25.02 #17392

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Nov 21, 2024

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

#17250 started using `pynvml` but did not add the proper dependency, this change fixes the missing dependency.

Authors:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - https://github.com/jakirkham

Approvers:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - https://github.com/jakirkham

URL: #17386
@rapids-bot rapids-bot bot requested review from a team as code owners November 21, 2024 00:10
@rapids-bot rapids-bot bot requested a review from AyodeAwe November 21, 2024 00:10
Copy link
Author

rapids-bot bot commented Nov 21, 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.

@github-actions github-actions bot added the Python Affects Python cuDF API. label Nov 21, 2024
@jakirkham
Copy link
Member

Addressing conflicts in PR: #17395

This is likely the easiest fix for avoiding CI errors from this part of the code.

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

Approvers:
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Bradley Dice (https://github.com/bdice)

URL: #17389
@rapids-bot rapids-bot bot requested a review from a team as a code owner November 21, 2024 02:47
@raydouglass raydouglass merged commit c46e9e4 into branch-25.02 Nov 21, 2024
246 of 247 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Python Affects Python cuDF API.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants