[MRG] Fix #12363 Included criterion.pxd #12381
Merged
Conversation
This file contains hidden or 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
jnothman
reviewed
Oct 14, 2018
sklearn/tree/setup.py
Outdated
| @@ -31,7 +31,7 @@ def configuration(parent_package="", top_path=None): | |||
| extra_compile_args=["-O3"]) | |||
|
|
|||
| config.add_subpackage("tests") | |||
|
|
|||
| config.add_data_files('_criterion.pxd') | |||
There was a problem hiding this comment.
Please also add the other pxd files here
jnothman
reviewed
Oct 15, 2018
sklearn/tree/setup.py
Outdated
| @@ -31,7 +31,11 @@ def configuration(parent_package="", top_path=None): | |||
| extra_compile_args=["-O3"]) | |||
|
|
|||
| config.add_subpackage("tests") | |||
| config.add_data_files('_criterion.pxd') | |||
| config.add_data_files("_tree.pxd") | |||
There was a problem hiding this comment.
do you mean I should add pxd files in alphabetical order
jnothman
reviewed
Oct 15, 2018
rth
approved these changes
Oct 15, 2018
There was a problem hiding this comment.
LGTM, scipy does this for cython_blas.pxd so it should be fine, I think.
|
Checked that these are included in the generated wheel. Merging. Thanks! |
thoo
pushed a commit
to thoo/scikit-learn
that referenced
this pull request
Nov 14, 2018
jnothman
pushed a commit
to jnothman/scikit-learn
that referenced
this pull request
Nov 14, 2018
jnothman
pushed a commit
to jnothman/scikit-learn
that referenced
this pull request
Nov 14, 2018
|
@RoopamSharma we're thinking of using memory views in the tree code, which implies some changes to the criterion and splitter's interface. What do you think about the changes proposed in #12886? |
|
Hi,
I'm not aware with the code. I just added the .pxd files as my first GitHub
commit.
Thanks & Regards
Roopam Sharma
…On Tue, Jan 15, 2019, 7:05 PM Adrin Jalali ***@***.*** wrote:
@RoopamSharma <https://github.com/RoopamSharma> we're thinking of using
memory views in the tree code, which implies some changes to the criterion
and splitter's interface. What do you think about the changes proposed in
#12886 <#12886>?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#12381 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AHE5NL-rFXg1MtiOGm0zlySC7nyUgxFBks5vDdksgaJpZM4XbPZ0>
.
|
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…it-learn#12381)" This reverts commit 0736a17.
xhluca
pushed a commit
to xhluca/scikit-learn
that referenced
this pull request
Apr 28, 2019
…it-learn#12381)" This reverts commit 0736a17.
koenvandevelde
pushed a commit
to koenvandevelde/scikit-learn
that referenced
this pull request
Jul 12, 2019
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.
Fixes #12363
Included _criterion.pxd in the sklearn/tree/setup.py wheel to derive new criterion