Forward-merge branch-24.06 into branch-24.08 #5905
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![rapids-bot[bot]](https://avatars.githubusercontent.com/in/85914?s=60&v=4){kind=small}
cc @vyasr Authors: - Dante Gama Dessavre (https://github.com/dantegd) Approvers: - Vyas Ramasubramani (https://github.com/vyasr) - Ray Douglass (https://github.com/raydouglass) URL: #5890
|
FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the |
Closes #5637 ``` import cuml from cuml.datasets import make_classification X, y = make_classification() clf = cuml.ensemble.RandomForestClassifier().fit(X,y) print(clf.predict(X[:5]).dtype) ``` Result is ``` int64 ``` Authors: - Jinsol Park (https://github.com/jinsolp) Approvers: - Dante Gama Dessavre (https://github.com/dantegd) URL: #5896
This is an attempt to update the scikit-learn dependency from 1.2 to 1.4. Most changes are related to constructor arguments that were deprecated in 1.2 and in 1.4 have changed/been removed. A question I have is what cuml's deprecation policy is? I've gone with "two releases" for parameters where we can easily do so (deprecated in 24.06 and then remove them in 24.10). However that is only about 4 months of deprecation which could be a bit short. Some of the changes would be hard to do as a deprecation (with 1.4 there is no way to provide the "old way"), we'd have to stick with 1.3 for now. I think this is a bit of a bummer but maybe the price to pay for not keeping on top of deprecations. And it seems like there is no deprecation policy in the docs/towards users? So maybe we can play this card once now, to catch up and at the same time introduce a deprecation policy. The SHAP test needed its reference updating. I am not sure why, at least I couldn't quickly find a reason for why you'd have to do this. I am not sure how possible it would be to support a range of scikit-learn versions (say 1.2 - 1.4). Would be cool but maybe not worth the added complexity? Todo: * [x] add deprecation warning in AgglomerativeClustering * [ ] add tests for deprecations * [x] RF regressor * [x] RF classifier * [ ] ~~LARS~~ - LARS is experimental, so no need for deprecation * [x] LogisticRegression * [x] OneHotEncoder * [x] AgglomerativeClustering * [ ] think about how to combine this with #5799 * [x] decide deprecation cycle length - copy cudf, so 24.06 -> 24.08 * [x] update "expiry" version in the warnings * [x] update doc strings xref #5799 Authors: - Tim Head (https://github.com/betatim) - Dante Gama Dessavre (https://github.com/dantegd) Approvers: - Dante Gama Dessavre (https://github.com/dantegd) - Jake Awe (https://github.com/AyodeAwe) URL: #5851
Similar to rapidsai/cudf#15552, we are testing [building RAPIDS with CCCL's main branch](NVIDIA/cccl#1667) to get ahead of any breaking changes. Authors: - Paul Taylor (https://github.com/trxcllnt) - Dante Gama Dessavre (https://github.com/dantegd) Approvers: - Kyle Edwards (https://github.com/KyleFromNVIDIA) - Dante Gama Dessavre (https://github.com/dantegd) URL: #5886
raydouglass
added a commit
that referenced
this pull request
Jun 3, 2024
Fix conflict of forward-merge #5905 of branch-24.06 into branch-24.08
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Forward-merge triggered by push to branch-24.06 that creates a PR to keep branch-24.08 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. See forward-merger docs for more info.