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

Manual merge of Branch 24.08 from 24.06 #15869

Merged
merged 2 commits into from
May 28, 2024
Merged

Manual merge of Branch 24.08 from 24.06 #15869

merged 2 commits into from
May 28, 2024

Conversation

galipremsagar
Copy link
Contributor

Description

Resolves conflicts in : #15868

Checklist

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

miscco and others added 2 commits May 28, 2024 08:47
@miscco @bernhardmgruber
@bdice @ttnghia @trxcllnt @PointKernel
Work around issues with cccl main (rapidsai#15552)
29429f7 
This gets cuDF build cccl main on 12.3.

There is one issue with the cuco tuple helpers but that will be fixed on
the cuco side

---------

Co-authored-by: Bernhard Manfred Gruber <[email protected]>
Co-authored-by: Bradley Dice <[email protected]>
Co-authored-by: Nghia Truong <[email protected]>
Co-authored-by: ptaylor <[email protected]>
Co-authored-by: Paul Taylor <[email protected]>
Co-authored-by: Yunsong Wang <[email protected]>
@galipremsagar
Merge branch-24.06 into branch-24.08
4fdbc6e
@galipremsagar galipremsagar added bug Something isn't working non-breaking Non-breaking change labels May 28, 2024
@galipremsagar galipremsagar self-assigned this May 28, 2024
@galipremsagar galipremsagar requested review from a team as code owners May 28, 2024 16:05
@github-actions github-actions bot added libcudf Affects libcudf (C++/CUDA) code. CMake CMake build issue labels May 28, 2024
@AyodeAwe AyodeAwe merged commit 27220d6 into rapidsai:branch-24.08 May 28, 2024
25 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raydouglass raydouglass Awaiting requested review from raydouglass raydouglass is a code owner automatically assigned from rapidsai/ci-codeowners

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

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

Assignees

@galipremsagar galipremsagar

Labels
bug Something isn't working CMake CMake build issue libcudf Affects libcudf (C++/CUDA) code. non-breaking Non-breaking change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@galipremsagar @AyodeAwe @miscco