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-24.12 into branch-25.02 #17395

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Forward-merge branch-24.12 into branch-25.02 #17395

merged 3 commits into from
Nov 21, 2024

Conversation

jakirkham
Copy link
Member

Resolving conflicts in forward merge PR: #17392

@pentschev
Add pynvml as a dependency for dask-cudf (rapidsai#17386)
68c4285 
rapidsai#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: rapidsai#17386
@jakirkham jakirkham requested review from a team as code owners November 21, 2024 01:59
@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API. CMake CMake build issue Java Affects Java cuDF API. cudf.pandas Issues specific to cudf.pandas cudf.polars Issues specific to cudf.polars pylibcudf Issues specific to the pylibcudf package labels Nov 21, 2024
@jakirkham jakirkham changed the base branch from branch-24.12 to branch-25.02 November 21, 2024 01:59
@jakirkham jakirkham requested a review from a team as a code owner November 21, 2024 01:59
@jakirkham jakirkham mentioned this pull request Nov 21, 2024
Merged
vyasr and others added 2 commits November 21, 2024 02:47
@vyasr
Ignore errors when testing glibc versions (rapidsai#17389)
0d9e577 
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: rapidsai#17389
@jakirkham
Merge branch-24.12 into branch-25.02
c46e9e4
@jakirkham jakirkham force-pushed the branch-25.02-merge-24.12 branch from b15b101 to c46e9e4 Compare November 21, 2024 03:33
@github-actions github-actions bot removed libcudf Affects libcudf (C++/CUDA) code. CMake CMake build issue Java Affects Java cuDF API. cudf.pandas Issues specific to cudf.pandas cudf.polars Issues specific to cudf.polars pylibcudf Issues specific to the pylibcudf package labels Nov 21, 2024
@raydouglass raydouglass merged commit 1bfc114 into rapidsai:branch-25.02 Nov 21, 2024
104 of 107 checks passed
@jakirkham jakirkham deleted the branch-25.02-merge-24.12 branch November 21, 2024 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jameslamb jameslamb Awaiting requested review from jameslamb jameslamb is a code owner automatically assigned from rapidsai/packaging-codeowners

@wence- wence- Awaiting requested review from wence- wence- was automatically assigned from rapidsai/cudf-python-codeowners

@mroeschke mroeschke Awaiting requested review from mroeschke mroeschke was automatically assigned from rapidsai/cudf-python-codeowners

Assignees

@jakirkham jakirkham

Labels
Python Affects Python cuDF API.
Projects
cuDF Python
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jakirkham @raydouglass @pentschev @vyasr