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

Fix merge conflict for branch-25.02 into branch-25.04 #17874

Merged
merged 4 commits into from
Jan 30, 2025
Merged

Fix merge conflict for branch-25.02 into branch-25.04 #17874

merged 4 commits into from
Jan 30, 2025

Conversation

davidwendt
Copy link
Contributor

Description

Fixes merge conflicts for auto-merger PR #17870

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 3 commits January 30, 2025 02:06
@bdice
Build and test with CUDA 12.8.0 (rapidsai#17834)
802d3e0 
This PR uses CUDA 12.8.0 to build and test.

xref: rapidsai/build-planning#139

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

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

URL: rapidsai#17834
@PointKernel
Fix the bug in determining the heuristics for shared memory groupby (r…
847fa28 
…apidsai#17851)

Fixes rapidsai#17853

This PR fixes a bug in determining the heuristics for shared memory groupby, ensuring that the implementation selects the shared memory code path only when there is enough shared memory available to hold temporary aggregation results for at least one column.

Authors:
  - Yunsong Wang (https://github.com/PointKernel)

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

URL: rapidsai#17851
@davidwendt
Fix merge conflict for branch-25.02 into branch-25.04
e5f32dc
@davidwendt davidwendt requested review from a team as code owners January 30, 2025 13:39
@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API. cudf.pandas Issues specific to cudf.pandas labels Jan 30, 2025
@davidwendt davidwendt added improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jan 30, 2025
@AyodeAwe AyodeAwe merged commit 5c179d1 into rapidsai:branch-25.04 Jan 30, 2025
107 of 110 checks passed
@davidwendt davidwendt deleted the fwd-merge-02-to-04 branch January 30, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

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

Assignees

@davidwendt davidwendt

Labels
cudf.pandas Issues specific to cudf.pandas improvement Improvement / enhancement to an existing function libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change Python Affects Python cuDF API.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@davidwendt @AyodeAwe @bdice @PointKernel