Skip to content

[MRG] BUG Fixes test_scale_and_stability in windows #15661

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

Merged

Conversation

thomasjpfan
Copy link
Member

  1. Resolves error in test_scale_and_stability by using cond that was used in scipy <= 1.2 for pinv2.

  2. The install.cmd was adjusted to match the pip installed packages in building the wheels.

With this merged, we should be able to get MacPython/scikit-learn-wheels#35 to work and build wheels for 3.8

It is a little strange that the error did not always appear with scipy installed from conda.

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.

This should be noted in what's new for users of recent scipy with scikit-learn 0.21

@rth
Copy link
Member

rth commented Nov 19, 2019

Thanks!

The install.cmd was adjusted to match the pip installed packages in building the wheels.

OK, but don't we still want to run tests with conda dependencies on Windows? What's the point of reproducing the CI for building wheels, if that is going to be tested when building wheels anyway?

@thomasjpfan
Copy link
Member Author

I had to get the CI to use wheels to reproduce the error here. I’ll revert the back CI back to conda.

Copy link
Member

@ogrisel ogrisel left a comment

Choose a reason for hiding this comment

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

This looks good to me as well. @thomasjpfan have you tracked the PR in scipy that changed this behavior? What is the reason for this change?

@thomasjpfan
Copy link
Member Author

This should be noted in what's new for users of recent scipy with scikit-learn 0.21

@jnothman Whats new in for 0.22.0 or 0.21.4?

@adrinjalali Can this be in the RC to get the windows wheel to build?

@thomasjpfan
Copy link
Member Author

thomasjpfan commented Nov 19, 2019

What is the reason for this change?

@ogrisel Here is the PR that made the change: scipy/scipy#10067

@adrinjalali
Copy link
Member

@adrinjalali Can this be in the RC to get the windows wheel to build?

I'll include it in RC3.

Interesting, then why is only windows which fails the test? It seems like here we're reverting the behavior to something which is not the desired solution, to pass the test. According the PR in scipy, the new bounds are a better choice. Therefore we should be using them, shouldn't we?

@thomasjpfan
Copy link
Member Author

According the PR in scipy, the new bounds are a better choice. Therefore we should be using them, shouldn't we?

In principle this would be good to do in another PR. We would need to update _nipals_twoblocks_inner_loop to take into account the new behavior of pinv2.

Interesting, then why is only windows which fails the test?

This test has a history of failing on windows:

Related:

Copy link
Member

@adrinjalali adrinjalali left a comment

Choose a reason for hiding this comment

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

Awesome, thanks @thomasjpfan . Feel free to merge once CI is green.

Also, since you know the details now, could you please also open an issue as you mentioned?

@thomasjpfan
Copy link
Member Author

Added to whats_new to 0.22.

@jnothman
Copy link
Member

I suppose we could consider this for a 0.21.4... We want to release 0.21 for CPython 3.8 and maybe it's easiest if it also supports scipy 1.3.

@ogrisel ogrisel merged commit 0831dfb into scikit-learn:master Nov 20, 2019
@ogrisel
Copy link
Member

ogrisel commented Nov 20, 2019

Thanks @thomasjpfan, I merged with your targeted whats new at 0.22. @adrinjalali please add this to your to-backport list for 0.22.X and optionally 0.21.X if you feel like making a companion 0.21.4 release to add support for Python 3.8 as suggested by @jnothman.

adrinjalali pushed a commit to adrinjalali/scikit-learn that referenced this pull request Nov 25, 2019
panpiort8 pushed a commit to panpiort8/scikit-learn that referenced this pull request Mar 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants