[Numpy-svn] r3726 - trunk/numpy/distutils

numpy-svn@scip... numpy-svn@scip...
Tue Apr 24 14:15:37 CDT 2007


Author: oliphant
Date: 2007-04-24 14:15:33 -0500 (Tue, 24 Apr 2007)
New Revision: 3726

Modified:
   trunk/numpy/distutils/system_info.py
Log:
Add patch to system_info for building with MKL on Win32 #504

Modified: trunk/numpy/distutils/system_info.py
===================================================================
--- trunk/numpy/distutils/system_info.py	2007-04-22 21:18:20 UTC (rev 3725)
+++ trunk/numpy/distutils/system_info.py	2007-04-24 19:15:33 UTC (rev 3726)
@@ -811,9 +811,12 @@
         info = {}
         dict_append(info,**mkl)
         dict_append(info,
-                    libraries = ['pthread'],
                     define_macros=[('SCIPY_MKL_H',None)],
                     include_dirs = incl_dirs)
+        if sys.platform == 'win32':
+            pass # win32 has no pthread library
+        else:
+            dict_append(libraries = ['pthread'])
         self.set_info(**info)
 
 class lapack_mkl_info(mkl_info):
@@ -822,7 +825,11 @@
         mkl = get_info('mkl')
         if not mkl:
             return
-        lapack_libs = self.get_libs('lapack_libs',['mkl_lapack32','mkl_lapack64'])
+        if sys.platform == 'win32':
+            lapack_libs = self.get_libs('lapack_libs',['mkl_lapack'])
+        else:
+            lapack_libs = self.get_libs('lapack_libs',['mkl_lapack32','mkl_lapack64'])
+            
         info = {'libraries': lapack_libs}
         dict_append(info,**mkl)
         self.set_info(**info)



More information about the Numpy-svn mailing list