Fixing auto-merge branch-25.02 into branch-25.04#17828
Fixing auto-merge branch-25.02 into branch-25.04#17828AyodeAwe merged 38 commits intorapidsai:branch-25.04from
Conversation
…fea/bump-polars-version
This PR upgrades the upper bound pinnings for `pyarrow` in `cudf`. Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Bradley Dice (https://github.com/bdice) URL: rapidsai#17794
Fixes: rapidsai#17775 This PR fixes a race condition that arises when `disable_module_accelerator` is used in a multi-threaded setting. Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Bradley Dice (https://github.com/bdice) URL: rapidsai#17811
Contributes to rapidsai#7795 This PR addressed most of the relaxed constexpr in cuIO. Authors: - Yunsong Wang (https://github.com/PointKernel) Approvers: - Basit Ayantunde (https://github.com/lamarrr) - Vukasin Milovanovic (https://github.com/vuule) URL: rapidsai#17746
davidwendt
added
3 - Ready for Review
Contributes to rapidsai/build-planning#136 For nightly builds, some `wheel-build-{project}` jobs currently wait to start until some other `wheel-publish-{dependency}` jobs complete. This is unnecessary... `wheel-build-{dependency}` jobs will upload packages to S3, which is where `wheel-build-{project}` jobs will download them from. This proposes changing that such that all nightly `wheel-build-*` jobs depend only other `wheel-build-*` jobs. This should decrease the end-to-end time it takes for all wheels to be built and published on nightly / branch builds. Also updates `pre-commit` config to the latest `rapids-dependency-file-generator` version. Authors: - James Lamb (https://github.com/jameslamb) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) URL: rapidsai#17792
## Description This PR fixes `pre-commit.ci` failures. ## Checklist - [x] I am familiar with the [Contributing Guidelines](https://github.com/rapidsai/cudf/blob/HEAD/CONTRIBUTING.md). - [x] New or existing tests cover these changes. - [x] The documentation is up to date with these changes. Co-authored-by: Vyas Ramasubramani <[email protected]>
…e string cols with chunked parquet reader (rapidsai#17702) Closes rapidsai#17692. This PR enables computing the `str_offset` required to correctly compute the offsets columns for nested large strings columns with chunked Parquet reader when `chunk_read_limit` is small resulting in multiple output table chunks per subpass. Authors: - Muhammad Haseeb (https://github.com/mhaseeb123) Approvers: - Yunsong Wang (https://github.com/PointKernel) - Ed Seidl (https://github.com/etseidl) - Vukasin Milovanovic (https://github.com/vuule) URL: rapidsai#17702
Bump polars version to 1.20
A small new string feature. Authors: - Lawrence Mitchell (https://github.com/wence-) Approvers: - Matthew Murray (https://github.com/Matt711) - Vyas Ramasubramani (https://github.com/vyasr) URL: rapidsai#17755
This PR applies `ruff` (`check` and `format`) everywhere, including notebooks and utility scripts. This allows us to drop our use of `nbqa`, since `ruff` natively supports notebooks. (xref: rapidsai#17819, rapidsai#17805) I manually updated a few notebooks that were using old NumPy syntax for generating random values. Closes rapidsai#17461. I also updated the `ruff` version to 0.9.3. Authors: - Bradley Dice (https://github.com/bdice) - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Vyas Ramasubramani (https://github.com/vyasr) - Matthew Murray (https://github.com/Matt711) URL: rapidsai#17820
Before embarking on more rolling window performance optimizations and code changes, let's introduce some new benchmarks: - demonstrating bad algorithmic behavior of large window rolling aggregations; - of the range-based rolling interface. Authors: - Lawrence Mitchell (https://github.com/wence-) - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Bradley Dice (https://github.com/bdice) - Vukasin Milovanovic (https://github.com/vuule) URL: rapidsai#17787
There is a timeout failure in nightly tests: https://github.com/rapidsai/cudf/actions/runs/12983287834/job/36204344253 It looks like CI runs can get very slow at times, hence bumping up the timeout. This test basically guards us to test against a hang, so 20s timeout should be good too. Authors: - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - Matthew Murray (https://github.com/Matt711) URL: rapidsai#17829
|
@davidwendt if you do the merge again now everything should pass. Given the amount of churn right now I think it's worth doing one more manual pass rather than merging this and seeing if the auto merge starts working again. |
…pat (rapidsai#17822) closes rapidsai#17786 Authors: - Matthew Roeschke (https://github.com/mroeschke) - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Vyas Ramasubramani (https://github.com/vyasr) - GALI PREM SAGAR (https://github.com/galipremsagar) - Lawrence Mitchell (https://github.com/wence-) URL: rapidsai#17822
The auto-merger is still stuck on merge conflicts. This PR was created to resolve merge conflicts so I believe this or something like this needs to be merged in order to resolve those merge conflicts otherwise the auto-merger will never pass. |
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
github-actions
bot
added
CMake
|
/ok to test |
No you are understanding correctly. What I was saying is that new commits have been merged to 25.02 since you created this PR so it would help for you to merge the latest 25.02 into this branch again so that we get those commits and resolve any associated conflicts. It appears that you have done that so we should be good here. Thanks! |
12 participants
Fixing merge conflicts for #17825