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.

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

[gpuCI] Forward-merge branch-22.04 to branch-22.06 [skip gpuci] #10596

Merged
merged 2 commits into from
Apr 5, 2022

Conversation

GPUtester
Copy link
Collaborator

Forward-merge triggered by push to branch-22.04 that creates a PR to keep branch-22.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.

@bdice spotted some copyright failures in #10512

This is because CI copyright checks were introduced in between of `22.04` release and some files that were modified prior to that didn't have their copyrights updated, so this PR updates those missing files.

Authors:
   - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
   - AJ Schmidt (https://github.com/ajschmidt8)
@GPUtester GPUtester requested review from a team as code owners April 5, 2022 15:22
@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/gpuci/#forward-mergers
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 CMake CMake build issue Java Affects Java cuDF API. Python Affects Python cuDF API. gpuCI libcudf Affects libcudf (C++/CUDA) code. labels Apr 5, 2022
Replaces the deprecated use of `as_gpu_matrix` with `to_cupy`, and also updates some deprecated calls to `cupy.fromDlpack`.

Closes #10582

Authors:
   - Charles Blackmon-Luca (https://github.com/charlesbluca)

Approvers:
   - GALI PREM SAGAR (https://github.com/galipremsagar)
   - AJ Schmidt (https://github.com/ajschmidt8)
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

ajschmidt8 added a commit that referenced this pull request Apr 5, 2022
This PR resolves merge conflicts in forward merger: #10596

Authors:
   - GALI PREM SAGAR (https://github.com/galipremsagar)
   - Charles Blackmon-Luca (https://github.com/charlesbluca)

Approvers:
   - AJ Schmidt (https://github.com/ajschmidt8)
@ajschmidt8 ajschmidt8 merged commit 6675c75 into branch-22.06 Apr 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake CMake build issue Java Affects Java cuDF API. libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants