[Scipy-svn] r6721 - in trunk/scipy: lib/lapack linalg

scipy-svn@scip... scipy-svn@scip...
Sat Sep 11 19:50:25 CDT 2010


Author: ptvirtan
Date: 2010-09-11 19:50:25 -0500 (Sat, 11 Sep 2010)
New Revision: 6721

Modified:
   trunk/scipy/lib/lapack/setup.py
   trunk/scipy/linalg/setup.py
Log:
3K: BUG: fix build of scipy.lib.lapack and scipy.linalg when Atlas is not installed

Modified: trunk/scipy/lib/lapack/setup.py
===================================================================
--- trunk/scipy/lib/lapack/setup.py	2010-09-12 00:50:10 UTC (rev 6720)
+++ trunk/scipy/lib/lapack/setup.py	2010-09-12 00:50:25 UTC (rev 6721)
@@ -55,7 +55,7 @@
         skip_names['clapack'].extend(\
             'sgetri dgetri cgetri zgetri spotri dpotri cpotri zpotri'\
             ' slauum dlauum clauum zlauum strtri dtrtri ctrtri ztrtri'.split())
-    elif atlas_version>'3.4.0' and atlas_version<='3.5.12':
+    elif atlas_version and atlas_version>'3.4.0' and atlas_version<='3.5.12':
         skip_names['clapack'].extend('cpotrf zpotrf'.split())
 
     # flapack:

Modified: trunk/scipy/linalg/setup.py
===================================================================
--- trunk/scipy/linalg/setup.py	2010-09-12 00:50:10 UTC (rev 6720)
+++ trunk/scipy/linalg/setup.py	2010-09-12 00:50:25 UTC (rev 6721)
@@ -87,7 +87,7 @@
         skip_names['clapack'].extend(\
             'sgetri dgetri cgetri zgetri spotri dpotri cpotri zpotri'\
             ' slauum dlauum clauum zlauum strtri dtrtri ctrtri ztrtri'.split())
-    elif atlas_version>'3.4.0' and atlas_version<='3.5.12':
+    elif atlas_version and atlas_version>'3.4.0' and atlas_version<='3.5.12':
         skip_names['clapack'].extend('cpotrf zpotrf'.split())
 
     def generate_pyf(extension, build_dir):



More information about the Scipy-svn mailing list