Manually resolve conflicts in between branch-24.12 and branch-24.10 #16871
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is the changes that will be in the cudf-polars point release. --------- Co-authored-by: Thomas Li <[email protected]> Co-authored-by: David Wendt <[email protected]> Co-authored-by: brandon-b-miller <[email protected]> Co-authored-by: Vyas Ramasubramani <[email protected]> Co-authored-by: brandon-b-miller <[email protected]> Co-authored-by: Bradley Dice <[email protected]> Co-authored-by: Manas Singh <[email protected]> Co-authored-by: Manas Singh <[email protected]>
CI only tests 1.7
… branch-24.10-merge-24.08
Forward-merge branch-24.08 to branch-24.10
Adds stream ordering to the public join APIs: - `inner_join` - `left_join` - `full_join` - `left_semi_join` - `left_anti_join` - `cross_join` - `conditional_inner_join` - `conditional_left_join` - `conditional_full_join` - `conditional_left_semi_join` - `conditional_left_anti_join` - `mixed_inner_join` - `mixed_left_join` - `mixed_full_join` - `mixed_left_semi_join` - `mixed_left_anti_join` - `mixed_inner_join_size` - `mixed_left_join_size` - `conditional_inner_join_size` - `conditional_left_join_size` - `conditional_left_semi_join_size` - `conditional_left_anti_join_size` closes rapidsai#16792 follows up rapidsai#13744 Authors: - Basit Ayantunde (https://github.com/lamarrr) Approvers: - Paul Mattione (https://github.com/pmattione-nvidia) - Nghia Truong (https://github.com/ttnghia) - David Wendt (https://github.com/davidwendt) URL: rapidsai#16793
Adds a much-needed "best practices" page to the Dask cuDF documentation. Authors: - Richard (Rick) Zamora (https://github.com/rjzamora) Approvers: - Peter Andreas Entschev (https://github.com/pentschev) - Lawrence Mitchell (https://github.com/wence-) URL: rapidsai#16821
Contributes to rapidsai#15162 One question is that I notice that the libcudf `compute_column` takes an expression computed by a routine in https://github.com/rapidsai/cudf/blob/branch-24.10/python/cudf/cudf/core/_internals/expressions.py. Does this need to be moved to pylibcudf too? Authors: - Matthew Roeschke (https://github.com/mroeschke) - GALI PREM SAGAR (https://github.com/galipremsagar) Approvers: - GALI PREM SAGAR (https://github.com/galipremsagar) URL: rapidsai#16760
The labeler was not updated for the move of pylibcudf to a separate package. Authors: - Vyas Ramasubramani (https://github.com/vyasr) Approvers: - Bradley Dice (https://github.com/bdice) URL: rapidsai#16868
This merge request exposes stream-ordering to the public-facing datetime APIs. - `extract_year` - `extract_month` - `extract_day` - `extract_weekday` - `extract_hour` - `extract_minute` - `extract_second` - `extract_millisecond_fraction` - `extract_microsecond_fraction` - `extract_nanosecond_fraction` - `last_day_of_month` - `day_of_year` - `add_calendrical_months` - `is_leap_year` - `days_in_month` - `extract_quarter` - `ceil_datetimes` - `floor_datetimes` - `round_datetimes` Follows-up rapidsai#13744 Closes rapidsai#16775 Authors: - Basit Ayantunde (https://github.com/lamarrr) Approvers: - Karthikeyan (https://github.com/karthikeyann) - Yunsong Wang (https://github.com/PointKernel) URL: rapidsai#16774
github-actions
bot
added
libcudf
galipremsagar
added
improvement
bdice
reviewed
Sep 23, 2024
| cudf-polars-polars-tests: | ||
| needs: wheel-build-cudf-polars | ||
| secrets: inherit | ||
| uses: rapidsai/shared-workflows/.github/workflows/[email protected] |
There was a problem hiding this comment.
This should be branch-24.12.
| # files in cudf_polars/pylibcudf", rather than "are there changes | ||
| # between upstream and this branch which touch cudf_polars/pylibcudf" | ||
| # TODO: is the target branch exposed anywhere in an environment variable? | ||
| if [ -n "$(git diff --name-only origin/branch-24.10...HEAD -- python/cudf_polars/ python/cudf/cudf/_lib/pylibcudf/)" ]; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR resolves merge conflicts seen in: #16866
Checklist