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

[REVIEW] Resolve Forward merging of branch-22.04 into branch-22.06 #10598

Merged

Conversation

galipremsagar
Copy link
Contributor

This PR resolves merge conflicts in forward merger: #10596

galipremsagar and others added 3 commits April 5, 2022 11:15
@bdice spotted some copyright failures in rapidsai#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)
Replaces the deprecated use of `as_gpu_matrix` with `to_cupy`, and also updates some deprecated calls to `cupy.fromDlpack`.

Closes rapidsai#10582

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

Approvers:
   - GALI PREM SAGAR (https://github.com/galipremsagar)
   - AJ Schmidt (https://github.com/ajschmidt8)
@galipremsagar galipremsagar requested review from a team as code owners April 5, 2022 16:14
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@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
@galipremsagar galipremsagar added 3 - Ready for Review Ready for review by team improvement Improvement / enhancement to an existing function non-breaking Non-breaking change and removed gpuCI libcudf Affects libcudf (C++/CUDA) code. Python Affects Python cuDF API. CMake CMake build issue Java Affects Java cuDF API. labels Apr 5, 2022
@galipremsagar galipremsagar self-assigned this Apr 5, 2022
@galipremsagar galipremsagar changed the title [REVIEW] Resolved Forward merging of branch-22.04 into branch-22.06 [REVIEW] Resolve Forward merging of branch-22.04 into branch-22.06 Apr 5, 2022
@codecov
Copy link

codecov bot commented Apr 5, 2022

Codecov Report

Merging #10598 (6675c75) into branch-22.06 (0aef0c1) will increase coverage by 0.01%.
The diff coverage is n/a.

@@               Coverage Diff                @@
##           branch-22.06   #10598      +/-   ##
================================================
+ Coverage         86.29%   86.31%   +0.01%     
================================================
  Files               140      140              
  Lines             22255    22255              
================================================
+ Hits              19205    19209       +4     
+ Misses             3050     3046       -4     
Impacted Files Coverage Δ
python/cudf/cudf/_fuzz_testing/io.py 0.00% <ø> (ø)
python/cudf/cudf/_fuzz_testing/main.py 0.00% <ø> (ø)
python/cudf/cudf/_version.py 100.00% <ø> (ø)
python/cudf/cudf/comm/gpuarrow.py 80.00% <ø> (ø)
python/cudf/cudf/core/udf/row_function.py 100.00% <ø> (ø)
python/cudf/cudf/core/udf/scalar_function.py 100.00% <ø> (ø)
python/cudf/cudf/core/udf/templates.py 100.00% <ø> (ø)
python/cudf/cudf/core/udf/typing.py 97.54% <ø> (ø)
python/cudf/cudf/datasets.py 97.56% <ø> (ø)
python/cudf/cudf/errors.py 100.00% <ø> (ø)
... and 12 more

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 9ee7617...6675c75. Read the comment docs.

@ajschmidt8 ajschmidt8 merged commit 3631860 into rapidsai: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
3 - Ready for Review Ready for review by team improvement Improvement / enhancement to an existing function non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants