MAINT sync lobpcg with SciPy main #25176
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
ogrisel
approved these changes
Dec 12, 2022
Member
ogrisel
left a comment
ogrisel
left a comment
There was a problem hiding this comment.
Assuming everything goes well with respect to the scikit-learn test suite, +1 for the sync on my side.
Member
Author
|
OK, so we trigger the error seen in the |
glemaitre
commented
Dec 12, 2022
ogrisel
reviewed
Dec 13, 2022
Co-authored-by: Olivier Grisel <[email protected]>
ogrisel
added
Waiting for Reviewer
Quick Review
glemaitre
commented
Dec 13, 2022
Comment on lines
+469
to
+474
| if "subset_by_index" in inspect.signature(eigh).parameters: | ||
| # scipy >= 1.5 | ||
| additional_params = {"subset_by_index": eigvals} | ||
| else: | ||
| # deprecated in scipy == 1.10 | ||
| additional_params = {"eigvals": eigvals} |
Member
Author
There was a problem hiding this comment.
I added this change here. Since it is in a try ... except ... the error could be hidden because we don't pass the right parameter. I assume that we never trigger this part in our test suite.
ogrisel
reviewed
Dec 13, 2022
lesteve
approved these changes
Dec 14, 2022
Member
lesteve
left a comment
lesteve
left a comment
There was a problem hiding this comment.
I tweaked a comment to say that the code is taken from v1.10 (or rather main but I guess scipy 1.10 will be released in the near future since 1.10.rc1 was released two days ago)
Vincent-Maladiere
pushed a commit
to Vincent-Maladiere/scikit-learn
that referenced
this pull request
Dec 14, 2022
Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Loïc Estève <[email protected]>
jjerphan
pushed a commit
to jjerphan/scikit-learn
that referenced
this pull request
Jan 3, 2023
Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Loïc Estève <[email protected]>
jjerphan
pushed a commit
to jjerphan/scikit-learn
that referenced
this pull request
Jan 20, 2023
Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Loïc Estève <[email protected]>
jjerphan
pushed a commit
to jjerphan/scikit-learn
that referenced
this pull request
Jan 20, 2023
Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Loïc Estève <[email protected]>
jjerphan
pushed a commit
to jjerphan/scikit-learn
that referenced
this pull request
Jan 23, 2023
Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Loïc Estève <[email protected]>
adrinjalali
pushed a commit
that referenced
this pull request
Jan 24, 2023
Co-authored-by: Olivier Grisel <[email protected]> Co-authored-by: Loïc Estève <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Before addressing the issue of the
eigvalsdeprecation ineighfunction, I think that we should update thelobpcgfunction.