[Scipy-svn] r7106 - in branches/0.9.x/scipy: lib/lapack linalg sparse/linalg/dsolve

[scipy-svn at scipy.org]

Author: rgommers
Date: 2011-01-29 22:33:50 -0600 (Sat, 29 Jan 2011)
New Revision: 7106

Modified:
   branches/0.9.x/scipy/lib/lapack/setup.py
   branches/0.9.x/scipy/linalg/setup.py
   branches/0.9.x/scipy/sparse/linalg/dsolve/setup.py
Log:
BUG: fix for build issue with MSCV 9, ifort and MKL. Patch by Christoph Gohkle. Closes #1376.

(backport of r7103)

Modified: branches/0.9.x/scipy/lib/lapack/setup.py
===================================================================
--- branches/0.9.x/scipy/lib/lapack/setup.py	2011-01-30 04:33:27 UTC (rev 7105)
+++ branches/0.9.x/scipy/lib/lapack/setup.py	2011-01-30 04:33:50 UTC (rev 7106)
@@ -96,9 +96,15 @@
                          )
 
     # atlas_version:
+    if os.name == 'nt' and 'FPATH' in os.environ:
+        define_macros = [('NO_ATLAS_INFO', 1)]
+    else:
+        define_macros = []
+
     config.add_extension('atlas_version',
                          sources = ['atlas_version.c'],
-                         extra_info = lapack_opt
+                         extra_info = lapack_opt,
+                         define_macros = define_macros
                          )
 
     config.add_data_dir('tests')

Modified: branches/0.9.x/scipy/linalg/setup.py
===================================================================
--- branches/0.9.x/scipy/linalg/setup.py	2011-01-30 04:33:27 UTC (rev 7105)
+++ branches/0.9.x/scipy/linalg/setup.py	2011-01-30 04:33:50 UTC (rev 7106)
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import os
 from distutils.dep_util import newer_group, newer
 from os.path import join
 
@@ -171,10 +172,15 @@
                          )
 
     # atlas_version:
+    if os.name == 'nt' and 'FPATH' in os.environ:
+        define_macros = [('NO_ATLAS_INFO', 1)]
+    else:
+        define_macros = []
 
     config.add_extension('atlas_version',
                          ['atlas_version.c'],
-                         extra_info = lapack_opt
+                         extra_info = lapack_opt,
+                         define_macros = define_macros
                          )
 
     config.add_data_dir('tests')

Modified: branches/0.9.x/scipy/sparse/linalg/dsolve/setup.py
===================================================================
--- branches/0.9.x/scipy/sparse/linalg/dsolve/setup.py	2011-01-30 04:33:27 UTC (rev 7105)
+++ branches/0.9.x/scipy/sparse/linalg/dsolve/setup.py	2011-01-30 04:33:50 UTC (rev 7106)
@@ -2,6 +2,7 @@
 from os.path import join, dirname
 import sys
 import os
+import glob
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
@@ -17,10 +18,15 @@
         superlu_defs = []
     superlu_defs.append(('USE_VENDOR_BLAS',1))
 
-    superlu_src = os.path.join(dirname(__file__), 'SuperLU', 'SRC')
+    superlu_src = join(dirname(__file__), 'SuperLU', 'SRC')
 
+    sources = list(glob.glob(join(superlu_src, '*.c')))
+    if os.name == 'nt' and 'FPATH' in os.environ:
+        # when using MSVC + MKL, lsame is already in MKL
+        sources.remove(join(superlu_src, 'lsame.c'))
+
     config.add_library('superlu_src',
-                       sources = [join(superlu_src,'*.c')],
+                       sources = sources,
                        macros = superlu_defs,
                        include_dirs=[superlu_src],
                        )