diff --git a/scikits/learn/linear_model/setup.py b/scikits/learn/linear_model/setup.py index 707f673a567ac65d838558418db9cb7a641ee4d2..a8f7a079f628ceae4fb0a52ae7bac21dc6848a49 100644 --- a/scikits/learn/linear_model/setup.py +++ b/scikits/learn/linear_model/setup.py @@ -1,11 +1,9 @@ from os.path import join -import warnings import numpy -import sys def configuration(parent_package='', top_path=None): from numpy.distutils.misc_util import Configuration - from numpy.distutils.system_info import get_info, get_standard_file, BlasNotFoundError + from numpy.distutils.system_info import get_info config = Configuration('linear_model', parent_package, top_path) # cd fast needs CBLAS diff --git a/scikits/learn/setup.py b/scikits/learn/setup.py index b2e940a486a73e66103b892ca5c98c39f2016ef2..2a903f27a20bc5c9b9b1ee5e0062a120e9c24f79 100644 --- a/scikits/learn/setup.py +++ b/scikits/learn/setup.py @@ -1,7 +1,6 @@ from os.path import join import warnings import numpy -import sys def configuration(parent_package='', top_path=None): @@ -36,12 +35,7 @@ def configuration(parent_package='', top_path=None): ('NO_ATLAS_INFO', 1) in blas_info.get('define_macros', [])): config.add_library('cblas', sources=[join('src', 'cblas', '*.c')]) - cblas_libs = ['cblas'] - blas_info.pop('libraries', None) warnings.warn(BlasNotFoundError.__doc__) - else: - cblas_libs = blas_info.pop('libraries', []) - config.add_extension('ball_tree', sources=[join('src', 'BallTree.cpp')],