Skip to content

[MRG] MAINT: Continue moving from CBLAS to scipy cython blas#13084

Merged
ogrisel merged 9 commits intoscikit-learn:masterfrom
jeremiedbb:cblas-to-scipy-cython-blas
Feb 20, 2019
Merged

[MRG] MAINT: Continue moving from CBLAS to scipy cython blas#13084
ogrisel merged 9 commits intoscikit-learn:masterfrom
jeremiedbb:cblas-to-scipy-cython-blas

Conversation

@jeremiedbb
Copy link
Copy Markdown
Member

@jeremiedbb jeremiedbb commented Feb 3, 2019

Another step toward #11638
This PR is a continuation of #12732.

  • There were BLAS calls in the following cython files: weight_vector.pyx, cd_fast.pyx and _k_means.pyx.

  • There were also BLAS calls in the C file cholesky_delete.h. I decided to move (using fused types) the only function there to cython in arrayfuncs.pyx where there was a python wrapper for it.

  • I added rot an rotg to the cython blas functions which I forgot in [MRG] Use Scipy cython BLAS API instead of bundled CBLAS #12732 because I didn't check C files...

  • I also removed linking to blas libs in some setups for modules which didn't call BLAS functions.

The only remaining calls to bundled CBLAS in sklearn appear in tron.cpp, used in liblinear. They can't be replaced easily by calls to scipy cython blas because the calls to BLAS are not from cython files but from C files.

@jeremiedbb
Copy link
Copy Markdown
Member Author

ping @ogrisel maybe you want to take a look :)

Copy link
Copy Markdown
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.

LGTM. The cholesky_delete call is covered by the tests of least_angle.py (I checked the coverage report).

@ogrisel ogrisel merged commit 6649059 into scikit-learn:master Feb 20, 2019
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
xhluca pushed a commit to xhluca/scikit-learn that referenced this pull request Apr 28, 2019
jackmitch pushed a commit to jackmitch/scikit-learn that referenced this pull request Jul 2, 2019
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants