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

Forward-merge branch-23.04 to branch-23.06 #13130

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Forward-merge branch-23.04 to branch-23.06 #13130

merged 1 commit into from
Apr 12, 2023

Conversation

GPUtester
Copy link
Collaborator

Forward-merge triggered by push to branch-23.04 that creates a PR to keep branch-23.06 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge.

@vyasr
Pin curand version (#13127)
ed9385b 
Merging the conda-forge curand recipe and building conda-forge packages has caused conda to choose a newer version of curand than what cudf currently supports (we cannot use the version from CUDA 12).

Closes #13126 

Authors:
   - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
   - Ray Douglass (https://github.com/raydouglass)
   - Robert Maynard (https://github.com/robertmaynard)
   - Bradley Dice (https://github.com/bdice)
@GPUtester GPUtester requested a review from a team as a code owner April 12, 2023 20:48
@GPUtester
Copy link
Collaborator Author

FAILURE - Unable to forward-merge due to conflicts, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/
IMPORTANT: Before merging and approving this PR, be sure to change the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@github-actions github-actions bot added the conda label Apr 12, 2023
@codecov
Copy link

codecov bot commented Apr 12, 2023 •
edited
Loading

Codecov Report

Patch coverage has no change and project coverage change: -0.01 ⚠️

Comparison is base (2c3b2ab) 85.47% compared to head (ed9385b) 85.47%.

Additional details and impacted files 
@@               Coverage Diff                @@
##           branch-23.06   #13130      +/-   ##
================================================
- Coverage         85.47%   85.47%   -0.01%     
================================================
  Files               152      152              
  Lines             24650    24650              
================================================
- Hits              21070    21069       -1     
- Misses             3580     3581       +1

see 1 file with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@vyasr vyasr mentioned this pull request Apr 12, 2023
Merged
3 tasks
@ajschmidt8 ajschmidt8 merged commit 2d311d7 into branch-23.06 Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GPUtester @ajschmidt8 @vyasr