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

[MRG] avoid storage of each tree predictions in iforest #13260

Merged
merged 1 commit into from Mar 2, 2019

Conversation

@ngoix
Copy link
Contributor

@ngoix ngoix commented Feb 25, 2019

fixes (partly) #12040

will do the chunking of X_test in another PR for clarity

@ngoix
Copy link
Contributor Author

@ngoix ngoix commented Feb 25, 2019

should not be too hard to rebase on #13251

@ngoix ngoix changed the title [WIP] avoid storage of each tree predictions [MRG] avoid storage of each tree predictions Feb 26, 2019
@ngoix ngoix changed the title [MRG] avoid storage of each tree predictions [MRG] avoid storage of each tree predictions in iforest Feb 26, 2019
@glemaitre
Copy link
Contributor

@glemaitre glemaitre commented Feb 26, 2019

It seems that you are modifying something which is changed in #13251 as well.
@albertcthomas it seems that we should kill one of the 2 PRs isn't it?

Copy link
Contributor

@glemaitre glemaitre left a comment

Actually I see that we could use the common tests from @albertcthomas

sklearn/ensemble/iforest.py Show resolved Hide resolved
@ngoix
Copy link
Contributor Author

@ngoix ngoix commented Feb 26, 2019

I don't think so, #13251 has nothing to do with the changes here. Conflicts will be on the changes in value of _average_path_length(1) and _average_path_length(2) so shouldn't be a problem. Let's merge #13251 first.

@albertcthomas
Copy link
Collaborator

@albertcthomas albertcthomas commented Feb 26, 2019

I think @ngoix is right, #13251 only changes a few output values of _average_path_length.

@albertcthomas
Copy link
Collaborator

@albertcthomas albertcthomas commented Feb 26, 2019

#13251 has just been merged so you can rebase @ngoix.

sklearn/ensemble/iforest.py Outdated Show resolved Hide resolved
sklearn/ensemble/iforest.py Show resolved Hide resolved
@agramfort agramfort added this to In progress in Sprint Paris 2019 Feb 28, 2019
Copy link
Collaborator

@albertcthomas albertcthomas left a comment

LGTM!

sklearn/ensemble/iforest.py Show resolved Hide resolved
@jnothman jnothman moved this from In progress to Needs review in Sprint Paris 2019 Feb 28, 2019
@agramfort
Copy link
Member

@agramfort agramfort commented Feb 28, 2019

@ngoix please update what's new 0.21.rst

and +1 for MRG. thanks

sklearn/ensemble/tests/test_iforest.py Outdated Show resolved Hide resolved
@ngoix ngoix force-pushed the iforest_memory branch from b0de10a to 600a158 Mar 1, 2019
@banilo
Copy link
Contributor

@banilo banilo commented Mar 1, 2019

looks good

@ngoix
Copy link
Contributor Author

@ngoix ngoix commented Mar 2, 2019

@agramfort can you merge?

Copy link
Member

@adrinjalali adrinjalali left a comment

LGTM, thanks!

@adrinjalali adrinjalali merged commit 12705bb into scikit-learn:master Mar 2, 2019
16 checks passed
Sprint Paris 2019 automation moved this from Needs review to Done Mar 2, 2019
xhlulu added a commit to xhlulu/scikit-learn that referenced this issue Apr 28, 2019
xhlulu added a commit to xhlulu/scikit-learn that referenced this issue Apr 28, 2019
xhlulu added a commit to xhlulu/scikit-learn that referenced this issue Apr 28, 2019
koenvandevelde added a commit to koenvandevelde/scikit-learn that referenced this issue Jul 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants