From 0faf690eb23de7a6cee9ce0caf5fbe271e7dcc27 Mon Sep 17 00:00:00 2001
From: Fabian Pedregosa <fabian.pedregosa@inria.fr>
Date: Thu, 24 Feb 2011 11:39:50 +0100
Subject: [PATCH] Deleted code is debugged code.
---
scikits/learn/linear_model/setup.py | 4 +---
scikits/learn/setup.py | 6 ------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/scikits/learn/linear_model/setup.py b/scikits/learn/linear_model/setup.py
index 707f673a56..a8f7a079f6 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 b2e940a486..2a903f27a2 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')],
--
GitLab