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

Forward-merge branch-21.12 to branch-22.02 #9730

Merged
merged 3 commits into from
Nov 19, 2021

Conversation

bdice
Copy link
Contributor

@bdice bdice commented Nov 19, 2021

Resolves conflicts in #9721 following the forward merger instructions. Necessary to fix failing gpuCI style checks with changed clang-format version.

galipremsagar and others added 3 commits November 17, 2021 20:01
This PR updates minimum version pinning of `cupy` that is compatible with CEC.
* upgrade clang to 11.1.0

* fix pytest
@bdice bdice requested review from a team as code owners November 19, 2021 04:42
@github-actions github-actions bot added conda Python Affects Python cuDF API. libcudf Affects libcudf (C++/CUDA) code. labels Nov 19, 2021
@karthikeyann karthikeyann added non-breaking Non-breaking change improvement Improvement / enhancement to an existing function labels Nov 19, 2021
@bdice bdice changed the title Forward-merge branch-21.12 to branch-22.02 [skip gpuci] Forward-merge branch-21.12 to branch-22.02 Nov 19, 2021
@bdice
Copy link
Contributor Author

bdice commented Nov 19, 2021

rerun tests

@codecov
Copy link

codecov bot commented Nov 19, 2021

Codecov Report

❗ No coverage uploaded for pull request base (branch-22.02@c1bfb26). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##             branch-22.02    #9730   +/-   ##
===============================================
  Coverage                ?   10.49%           
===============================================
  Files                   ?      119           
  Lines                   ?    20305           
  Branches                ?        0           
===============================================
  Hits                    ?     2130           
  Misses                  ?    18175           
  Partials                ?        0           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c1bfb26...967a333. Read the comment docs.

@galipremsagar
Copy link
Contributor

galipremsagar commented Nov 19, 2021

Thanks @bdice !
@ajschmidt8 could you admin merge this pr? or probably approval will work too..

@ttnghia
Copy link
Contributor

ttnghia commented Nov 19, 2021

@gpucibot merge

@ttnghia
Copy link
Contributor

ttnghia commented Nov 19, 2021

Still need approval to merge.

Waiting on code owner review from rapidsai/ops-codeowners.

@ajschmidt8 ajschmidt8 merged commit 0f1f1e7 into rapidsai:branch-22.02 Nov 19, 2021
@bdice bdice deleted the branch-22.02-merge-21.12 branch November 19, 2021 16:26
@bdice
Copy link
Contributor Author

bdice commented Nov 19, 2021

Thanks for the quick review/merge! 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

6 participants