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

Deprecate merge_sorted, change dask cudf usage to internal method #10713

Merged

Conversation

isVoid
Copy link
Contributor

@isVoid isVoid commented Apr 22, 2022

This PR deprecates non-pandas conform method cudf.merge_sorted and change dask cudf usage to internal method _merge_sorted.

I also updated msg keyword in pytest.skip in multiple tests to reason, this removes 1000+ test warnings.

cc @vyasr @rjzamora

@isVoid isVoid requested review from a team as code owners April 22, 2022 04:01
@isVoid isVoid requested review from vyasr and skirui-source April 22, 2022 04:01
@github-actions github-actions bot added the Python Affects Python cuDF API. label Apr 22, 2022
@isVoid isVoid added 3 - Ready for Review Ready for review by team non-breaking Non-breaking change deprecation improvement Improvement / enhancement to an existing function labels Apr 22, 2022
@codecov
Copy link

codecov bot commented Apr 22, 2022

Codecov Report

Merging #10713 (1844f74) into branch-22.06 (d6e3068) will increase coverage by 0.07%.
The diff coverage is 93.33%.

❗ Current head 1844f74 differs from pull request most recent head 8558542. Consider uploading reports for the commit 8558542 to get more accurate results

@@               Coverage Diff                @@
##           branch-22.06   #10713      +/-   ##
================================================
+ Coverage         86.36%   86.43%   +0.07%     
================================================
  Files               142      143       +1     
  Lines             22302    22448     +146     
================================================
+ Hits              19261    19403     +142     
- Misses             3041     3045       +4     
Impacted Files Coverage Δ
python/cudf/cudf/_fuzz_testing/fuzzer.py 0.00% <0.00%> (ø)
python/cudf/cudf/_fuzz_testing/utils.py 0.00% <ø> (ø)
python/cudf/cudf/_lib/__init__.py 100.00% <ø> (ø)
python/cudf/cudf/comm/gpuarrow.py 79.76% <ø> (ø)
python/cudf/cudf/core/column/string.py 89.21% <ø> (+0.12%) ⬆️
python/cudf/cudf/testing/dataset_generator.py 73.25% <ø> (ø)
python/cudf/cudf/testing/testing.py 81.69% <ø> (ø)
python/custreamz/custreamz/kafka.py 29.16% <ø> (ø)
python/dask_cudf/dask_cudf/io/orc.py 91.04% <ø> (ø)
python/dask_cudf/dask_cudf/io/parquet.py 92.39% <81.08%> (-1.40%) ⬇️
... and 27 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 d6e3068...8558542. Read the comment docs.

Copy link
Member

@rjzamora rjzamora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @isVoid ! Moving merge_sorted to a private funciton makes sense to me.

Can we update the merge_sorted tests in test_reshape.py to point to the correct _merge_sorted function now (and maybe wrap the deprecated usage in a with pytest.warns block in one place)?

@vyasr
Copy link
Contributor

vyasr commented Apr 25, 2022

Thanks @isVoid ! Moving merge_sorted to a private funciton makes sense to me.

Can we update the merge_sorted tests in test_reshape.py to point to the correct _merge_sorted function now (and maybe wrap the deprecated usage in a with pytest.warns block in one place)?

Yes, let's update the tests here if possible. That will make @bdice's job of removing warnings from tests easier. I'll admit that given the large number of warnings our tests currently throw I have been lax about making these changes in my own deprecation PRs, but in those cases the tests were getting entirely removed in the next release so there was less value in putting in the effort. In this case we expect to continue maintaining (and therefore testing) _merge_sorted indefinitely.

@isVoid
Copy link
Contributor Author

isVoid commented Apr 25, 2022

rerun tests

@vyasr vyasr requested a review from rjzamora May 2, 2022 16:28
@vyasr
Copy link
Contributor

vyasr commented May 2, 2022

@rjzamora let us know if this looks good to you now.

@vyasr vyasr closed this May 2, 2022
@vyasr vyasr reopened this May 2, 2022
@vyasr
Copy link
Contributor

vyasr commented May 2, 2022

Ack sorry pushed the wrong button sorry. Did not mean to close.

@isVoid
Copy link
Contributor Author

isVoid commented May 2, 2022

I also updated msg keyword in pytest.skip in multiple tests to reason, this removes 1000+ test warnings.

Copy link
Member

@rjzamora rjzamora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks @isVoid !

@vyasr
Copy link
Contributor

vyasr commented May 2, 2022

I also updated msg keyword in pytest.skip in multiple tests to reason, this removes 1000+ test warnings.

@bdice will thank you.

@vyasr
Copy link
Contributor

vyasr commented May 2, 2022

@gpucibot merge

@rapids-bot rapids-bot bot merged commit a9eb47c into rapidsai:branch-22.06 May 2, 2022
@isVoid isVoid deleted the improvement/deprecate_merge_sorted branch May 9, 2022 17:55
rapids-bot bot pushed a commit that referenced this pull request Jun 3, 2022
This removes the public API of `cudf.merge_sorted`. This has been replaced by an internal API and does not need to be exposed in the cudf public API. Deprecated in #10713.

Authors:
  - Bradley Dice (https://github.com/bdice)

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

URL: #11032
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 Python Affects Python cuDF API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants