Merge pull request scikit-learn#2955 from larsmans/less-blas

[MRG+1] use CBLAS instead of Fortran BLAS in Liblinear

Author: GaelVaroquaux

sklearn/svm/setup.py

@@ -1,8 +1,11 @@
+import os
 from os.path import join
 import numpy
 
 import warnings
 
+from sklearn._build_utils import get_blas_info
+
 
 def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
@@ -39,30 +42,24 @@ def configuration(parent_package='', top_path=None):
                          )
 
     ### liblinear module
-    blas_sources = [join('src', 'blas', 'daxpy.c'),
-                    join('src', 'blas', 'ddot.c'),
-                    join('src', 'blas', 'dnrm2.c'),
-                    join('src', 'blas', 'dscal.c')]
+    cblas_libs, blas_info = get_blas_info()
+    if os.name == 'posix':
+        cblas_libs.append('m')
 
     liblinear_sources = ['liblinear.c',
                          join('src', 'liblinear', '*.cpp')]
 
     liblinear_depends = [join('src', 'liblinear', '*.h'),
                          join('src', 'liblinear', 'liblinear_helper.c')]
 
-    # we try to link against system-wide blas
-    blas_info = get_info('blas_opt', 0)
-
-    if not blas_info:
-        config.add_library('blas', blas_sources)
-        warnings.warn(BlasNotFoundError.__doc__)
-
     config.add_extension('liblinear',
                          sources=liblinear_sources,
-                         libraries=blas_info.pop('libraries', ['blas']),
-                         include_dirs=['src',
+                         libraries=cblas_libs,
+                         include_dirs=[join('..', 'src', 'cblas'),
                                        numpy.get_include(),
                                        blas_info.pop('include_dirs', [])],
+                         extra_compile_args=blas_info.pop('extra_compile_args',
+                                                          []),
                          depends=liblinear_depends,
                          # extra_compile_args=['-O0 -fno-inline'],
                          ** blas_info)