Skip to content

Commit

Permalink
ENH trying to catch that damn thing.
Browse files Browse the repository at this point in the history
  • Loading branch information
amueller committed Jul 23, 2012
1 parent c1c734a commit 9300d96
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions sklearn/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ def get_blas_info():

def atlas_not_found(blas_info_):
def_macros = blas_info.get('define_macros', [])
if [('ATLAS_INFO', 'None')] in def_macros:
# this one turned up on FreeBSD
return True
for x in def_macros:
if x[0] == "NO_ATLAS_INFO":
# if x[1] != 1 we should have lapack
# how do we do that now?
return True
if x[0] == "ATLAS_INFO":
if "None" in x[1]:
# this one turned up on FreeBSD
return True
return False

blas_info = get_info('blas_opt', 0)
Expand Down

2 comments on commit 9300d96

@GaelVaroquaux
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nasty!

This sort of things gives me the creeps: you never know where they are hiding, or how to test for them.

@amueller
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well before I just ignored all the escape characters around the "None" in jfrelinger's output. Maybe wasn't that smart. Still kinda hard to catch. And if the value is actually None I still wouldn't catch it ^^ but let's see if that comes up...

Please sign in to comment.