Skip to content

[MRG+1] Resolve the problem with cross_val_predict(method=) when passing X or y as list #9600

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 7 commits into from
Aug 22, 2017
Merged

[MRG+1] Resolve the problem with cross_val_predict(method=) when passing X or y as list #9600

merged 7 commits into from
Aug 22, 2017

Conversation

rrkarim
Copy link

@rrkarim rrkarim commented Aug 22, 2017 •
edited
Loading

Reference Issue

Fixes: #9592

@jnothman
Copy link
Member

Please make the title more descriptive, and the reference issue should be prefixed by "Fixes"

@rrkarim rrkarim changed the title issue 9592 Resolve the problem with cross_val_predict(method=) when passing X or y as list Aug 22, 2017
jnothman
jnothman reviewed Aug 22, 2017
View reviewed changes
sklearn/model_selection/_validation.py Outdated
@@ -732,7 +732,7 @@ def _fit_and_predict(estimator, X, y, train, test, verbose, fit_params,
predictions = func(X_test)
if method in ['decision_function', 'predict_proba', 'predict_log_proba']:
n_classes = len(set(y))
predictions_ = np.zeros((X_test.shape[0], n_classes))
predictions_ = np.zeros((((X_test.shape[0]) if type(X_test) is np.ndarray else (_num_samples(X_test))), n_classes))
Copy link
Member

Choose a reason for hiding this comment

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

you should be able to use _num_samples in all cases.

Copy link
Author

Choose a reason for hiding this comment

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

true...

sklearn/model_selection/tests/test_validation.py Outdated
@@ -808,6 +808,10 @@ def test_cross_val_predict_input_types():
clf = CheckingClassifier(check_y=list_check)
predictions = cross_val_predict(clf, X, y.tolist())

#test with X and y as list and non empty method
predictions = cross_val_predict(LogisticRegression(), X.tolist(), y.tolist(), method='decision_function')
Copy link
Member

Choose a reason for hiding this comment

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

Please keep line length under 80 chars

coderinuse and others added 2 commits August 22, 2017 06:06
jnothman
jnothman reviewed Aug 22, 2017
View reviewed changes
Copy link
Member

@jnothman jnothman left a comment

Choose a reason for hiding this comment

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

Thanks

sklearn/model_selection/tests/test_validation.py Outdated
@@ -808,6 +808,12 @@ def test_cross_val_predict_input_types():
clf = CheckingClassifier(check_y=list_check)
predictions = cross_val_predict(clf, X, y.tolist())

#test with X and y as list and non empty method
Copy link
Member

Choose a reason for hiding this comment

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

PEP8: space after #

sklearn/model_selection/tests/test_validation.py Outdated
@@ -808,6 +808,12 @@ def test_cross_val_predict_input_types():
clf = CheckingClassifier(check_y=list_check)
predictions = cross_val_predict(clf, X, y.tolist())

#test with X and y as list and non empty method
predictions = cross_val_predict(LogisticRegression(), X.tolist(),
Copy link
Member

Choose a reason for hiding this comment

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

PEP8 indentation, please; preferably:

    predictions = cross_val_predict(LogisticRegression(), X.tolist(),
                                    y.tolist(), method='decision_function')

@jnothman
Copy link
Member

LGTM, thanks!

@jnothman jnothman changed the title Resolve the problem with cross_val_predict(method=) when passing X or y as list [MRG+1] Resolve the problem with cross_val_predict(method=) when passing X or y as list Aug 22, 2017
@jnothman jnothman added this to the 0.19.1 milestone Aug 22, 2017
@jnothman jnothman added the Bug label Aug 22, 2017
@NelleV
Copy link
Member

NelleV commented Aug 22, 2017

Thanks @CoderINusE !

@NelleV NelleV merged commit 9e9b78d into scikit-learn:master Aug 22, 2017
jnothman pushed a commit to jnothman/scikit-learn that referenced this pull request Aug 23, 2017
@jnothman
[MRG+1] Resolve the problem with cross_val_predict(method=) when pass…
85e1575 
…ing X or y as list (scikit-learn#9600)

* issue 9592

* issue resolve

* resolve issue

* review

* Delete sample.py

* review
AishwaryaRK pushed a commit to AishwaryaRK/scikit-learn that referenced this pull request Aug 29, 2017
@AishwaryaRK
[MRG+1] Resolve the problem with cross_val_predict(method=) when pass…
03ad0f2 
…ing X or y as list (scikit-learn#9600)

* issue 9592

* issue resolve

* resolve issue

* review

* Delete sample.py

* review
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
@maskani-moh
[MRG+1] Resolve the problem with cross_val_predict(method=) when pass…
349f754 
…ing X or y as list (scikit-learn#9600)

* issue 9592

* issue resolve

* resolve issue

* review

* Delete sample.py

* review
jwjohnson314 pushed a commit to jwjohnson314/scikit-learn that referenced this pull request Dec 18, 2017
[MRG+1] Resolve the problem with cross_val_predict(method=) when pass…
dc4530d 
…ing X or y as list (scikit-learn#9600)

* issue 9592

* issue resolve

* resolve issue

* review

* Delete sample.py

* review
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnothman jnothman jnothman left review comments

Assignees
No one assigned
Labels
Bug
Projects
None yet
Milestone
0.19.1
Development

Successfully merging this pull request may close these issues.
3 participants
@rrkarim @jnothman @NelleV