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] RF param initialization cython and C++ layer cleanup #3358

Merged

Conversation

venkywonka
Copy link
Contributor

  • This PR partially solves the issue raised here.
  • Removes unused DecisionTreeParams struct in randomforest_shared.pxd.
  • Unifies the different APIs (namely set_rf_params, set_all_rf_params, set_rf_class_obj) into a single point of parameter initialization (as set_rf_params) in the C++ layer; and propagating the changes.

  * deleting unused DecisionTreeParams class in cython layer
  * unifying the APIs that set params to randomforest class to create
  single point of entry
@venkywonka venkywonka requested review from a team as code owners January 11, 2021 06:28
@venkywonka venkywonka added CUDA / C++ CUDA issue Cython / Python Cython or Python issue improvement Improvement / enhancement to an existing function non-breaking Non-breaking change labels Jan 11, 2021
@hcho3 hcho3 self-requested a review January 11, 2021 07:07
@hcho3
Copy link
Contributor

hcho3 commented Jan 11, 2021

Will try to review this week.

@venkywonka
Copy link
Contributor Author

Will try to review this week.

thanks @hcho3 😃

@teju85
Copy link
Member

teju85 commented Jan 21, 2021

@hcho3 did you get a chance to review this?

Copy link
Contributor

@hcho3 hcho3 left a comment

Choose a reason for hiding this comment

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

LGTM. I have some minor comments.

cpp/src/randomforest/randomforest.cu Outdated Show resolved Hide resolved
  * pruned comments and a redundant line
@venkywonka
Copy link
Contributor Author

rerun tests

@JohnZed
Copy link
Contributor

JohnZed commented Feb 3, 2021

Oof! Looks like this ended up with some merge conflicts due to other RF merges. @venkywonka would you mind taking a look? We should still be able to get this into 0.18

@venkywonka
Copy link
Contributor Author

Oof! Looks like this ended up with some merge conflicts due to other RF merges. @venkywonka would you mind taking a look? We should still be able to get this into 0.18

sure @JohnZed , done! ✌🏾

@venkywonka
Copy link
Contributor Author

rerun tests

@JohnZed JohnZed changed the base branch from branch-0.18 to branch-0.19 February 10, 2021 05:57
@JohnZed JohnZed requested a review from a team as a code owner February 10, 2021 05:57
@github-actions github-actions bot added the CMake label Feb 10, 2021
@vinaydes
Copy link
Contributor

@venkywonka Can you bring your branch forward to 0.19? Also revert changes done to CHANGELOG.md. Thanks.

@github-actions github-actions bot removed the CMake label Feb 15, 2021
@venkywonka
Copy link
Contributor Author

@venkywonka Can you bring your branch forward to 0.19? Also revert changes done to CHANGELOG.md. Thanks.

done vinay

@venkywonka
Copy link
Contributor Author

rerun tests

@JohnZed
Copy link
Contributor

JohnZed commented Mar 1, 2021

rerun tests

@codecov-io
Copy link

Codecov Report

Merging #3358 (b8f7609) into branch-0.19 (f5d86b9) will decrease coverage by 27.94%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff                @@
##           branch-0.19    #3358       +/-   ##
================================================
- Coverage        72.91%   44.96%   -27.95%     
================================================
  Files              214      223        +9     
  Lines            16856    16932       +76     
================================================
- Hits             12290     7613     -4677     
- Misses            4566     9319     +4753     
Flag Coverage Δ
dask 44.96% <100.00%> (?)
non-dask ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
python/cuml/ensemble/randomforestclassifier.pyx 58.92% <100.00%> (-14.48%) ⬇️
python/cuml/ensemble/randomforestregressor.pyx 67.34% <100.00%> (-3.27%) ⬇️
python/cuml/_thirdparty/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/thirdparty_adapters/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/_thirdparty/sklearn/exceptions.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/experimental/explainer/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/_thirdparty/sklearn/utils/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/experimental/linear_model/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/experimental/preprocessing/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
...ython/cuml/experimental/hyperopt_utils/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
... and 157 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 f5d86b9...b8f7609. Read the comment docs.

@venkywonka venkywonka changed the title RF param initialization cython and C++ layer cleanup [REVIEW] RF param initialization cython and C++ layer cleanup Mar 17, 2021
Copy link
Member

@teju85 teju85 left a comment

Choose a reason for hiding this comment

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

Changes LGTM.

@teju85
Copy link
Member

teju85 commented Mar 17, 2021

@gpucibot merge

@rapids-bot rapids-bot bot merged commit 14bd6c1 into rapidsai:branch-0.19 Mar 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CUDA / C++ CUDA issue Cython / Python Cython or Python issue improvement Improvement / enhancement to an existing function libcuml non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants