Skip to content

branch-25.10-merge-branch-25.08 #19429

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
Open
wants to merge 15 commits into
base: branch-25.10
Choose a base branch
from
Open

branch-25.10-merge-branch-25.08 #19429

wants to merge 15 commits into from

Conversation

davidwendt
Copy link
Contributor

@davidwendt davidwendt commented Jul 18, 2025 •
edited
Loading

Description

Fixes merge conflicts found by auto merger

#19416

Checklist

  • I am familiar with the Contributing Guidelines.
  • New or existing tests cover these changes.
  • The documentation is up to date with these changes.

bdice and others added 8 commits July 17, 2025 20:03
@bdice
Use numba-cuda>=0.15.2,<0.16 (rapidsai#19413)
8783ded 
- Partially reverts rapidsai#19213
- Use numba-cuda>=0.15.2,<0.16

We are investigating an issue where the new CUDA bindings in numba-cuda 0.16 cause segfaults, blocking our CI. This temporarily downgrades to numba-cuda >=0.15.2,<0.16 until a fix can be made.

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

Approvers:
  - https://github.com/brandon-b-miller
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Gil Forsyth (https://github.com/gforsyth)

URL: rapidsai#19413
@gforsyth
fix(docker): use versioned -latest tag for all rapidsai images (r…
e443433 
…apidsai#19412)

In rapidsai/build-planning#187 we switched the docker image tagging scheme
over to include the CalVer information.  This was done to allow us to make
changes to the images during burndown without breaking release pipelines.

This PR moves all of the existing `latest` tags to the newer versioned tag
`25.08-latest` and also modifies the `update_version.sh` script to bump
that version at branch creation time.

xref: rapidsai/build-planning#187

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

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

URL: rapidsai#19412
@davidwendt
Add new cudf::top_k API (rapidsai#19303)
d245a63 
Adds new `cudf::top_k` API to compute the top K values for a given column.
This essentially performs a descending sort followed by a gather of the first K elements.

Reference: rapidsai#19096

Authors:
  - David Wendt (https://github.com/davidwendt)

Approvers:
  - Muhammad Haseeb (https://github.com/mhaseeb123)
  - Yunsong Wang (https://github.com/PointKernel)

URL: rapidsai#19303
@davidwendt
Add cudf::strings::split_part API (rapidsai#19289)
e16037a 
Adds new strings API 
```
std::unique_ptr<column> split_part(
  strings_column_view const& input,
  string_scalar const& delimiter,
  size_type index,
  rmm::cuda_stream_view stream,
  rmm::device_async_resource_ref mr);
```
This will perform a split on each row using the given delimiter but only return the token at 0-based `index`.

Authors:
  - David Wendt (https://github.com/davidwendt)

Approvers:
  - Yunsong Wang (https://github.com/PointKernel)
  - Vukasin Milovanovic (https://github.com/vuule)
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#19289
@ttnghia
Switch from thrust::sort to cub::DeviceRadixSort in Parquet chunk…
13f4841 
…ed reader (rapidsai#19414)

This is to workaround an issue with `cub::DeviceMergeSort` in CCCL (NVIDIA/cccl#5297), which is called by `thrust::sort`. By explicitly calling to `cub::DeviceRadixSort`, we can avoid the crash issue reported in NVIDIA/spark-rapids#12949.

Authors:
  - Nghia Truong (https://github.com/ttnghia)

Approvers:
  - David Wendt (https://github.com/davidwendt)
  - Bradley Dice (https://github.com/bdice)
  - Muhammad Haseeb (https://github.com/mhaseeb123)

URL: rapidsai#19414
@AyodeAwe
fix update-version to match extras (rapidsai#19420)
cd54e33 
Updates the `update-version.sh` script to properly handle package names
with extras (e.g `pylibcudf-cu12[pyarrow]`) during version updates.
@mhaseeb123
Add a parquet reader utility to update output null masks (rapidsai#19370
52e7b82 
)

Contributes to PR rapidsai#19308

This PR adds a parquet reader utility to update the null masks of output buffers in order to nullify rows corresponding to the pruned out pages.

No independent tests for this PR here. Instead this is tested in rapidsai#19308

Authors:
  - Muhammad Haseeb (https://github.com/mhaseeb123)

Approvers:
  - Tianyu Liu (https://github.com/kingcrimsontianyu)
  - Bradley Dice (https://github.com/bdice)
  - Vukasin Milovanovic (https://github.com/vuule)

URL: rapidsai#19370
@davidwendt
Merge branch-25.08 into branch-25.10
d3a7b12
@davidwendt davidwendt self-assigned this Jul 18, 2025
@davidwendt davidwendt requested review from a team as code owners July 18, 2025 13:00
@davidwendt davidwendt added 3 - Ready for Review Ready for review by team non-breaking Non-breaking change labels Jul 18, 2025
@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API. CMake CMake build issue labels Jul 18, 2025
@GPUtester GPUtester moved this to In Progress in cuDF Python Jul 18, 2025
gforsyth
gforsyth reviewed Jul 18, 2025
View reviewed changes
@davidwendt davidwendt added the bug Something isn't working label Jul 18, 2025
bdice and others added 3 commits July 18, 2025 15:01
@bdice
Use numba-cuda >=0.14.0,<0.15.0 (rapidsai#19425)
6b6765e 
Correction for rapidsai#19413.

We need to use `numba-cuda>=0.14.0,<0.15.0` so that we don't get the new CUDA bindings.

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

Approvers:
  - https://github.com/brandon-b-miller
  - GALI PREM SAGAR (https://github.com/galipremsagar)
  - Vyas Ramasubramani (https://github.com/vyasr)

URL: rapidsai#19425
@davidwendt
fix merge conflict
97f5112
@galipremsagar
Drop cuda 11 usages (rapidsai#19386)
55ad793 
This PR drops cuda-11 usages in `cudf` codebase.

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

Approvers:
  - Tom Augspurger (https://github.com/TomAugspurger)
  - Matthew Murray (https://github.com/Matt711)
  - Bradley Dice (https://github.com/bdice)
  - Nghia Truong (https://github.com/ttnghia)

URL: rapidsai#19386
@davidwendt davidwendt requested review from a team as code owners July 18, 2025 17:51
@davidwendt davidwendt requested review from wence- and rjzamora July 18, 2025 17:51
@review-notebook-app Review Notebook App
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@github-actions github-actions bot added Java Affects Java cuDF API. cudf-polars Issues specific to cudf-polars labels Jul 18, 2025
@davidwendt
Copy link
Contributor Author

/merge nosquash

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gforsyth gforsyth gforsyth left review comments

@bdice bdice bdice approved these changes

@shrshi shrshi Awaiting requested review from shrshi shrshi is a code owner automatically assigned from rapidsai/cudf-cpp-codeowners

@ttnghia ttnghia Awaiting requested review from ttnghia ttnghia is a code owner automatically assigned from rapidsai/cudf-cpp-codeowners

@wence- wence- Awaiting requested review from wence- wence- is a code owner automatically assigned from rapidsai/cudf-python-codeowners

@rjzamora rjzamora Awaiting requested review from rjzamora rjzamora is a code owner automatically assigned from rapidsai/cudf-python-codeowners

At least 1 approving review is required to merge this pull request.

Assignees

@davidwendt davidwendt

Labels
3 - Ready for Review Ready for review by team bug Something isn't working CMake CMake build issue cudf-polars Issues specific to cudf-polars Java Affects Java cuDF API. libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change Python Affects Python cuDF API.
Projects
cuDF Python
Status: In Progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@davidwendt @gforsyth @bdice @ttnghia @AyodeAwe @mhaseeb123 @galipremsagar