diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2007-04-24 19:15:33 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2007-04-24 19:15:33 +0000 |
| commit | feb86b4d0dc37dee914bd7ca37324727058c2d0b (patch) | |
| tree | 055f68abd3279ff91d85b120080048e875a04107 | |
| parent | 6a3e80e50be8e325dd01e63f3874b29764fe37d4 (diff) | |
| download | numpy-feb86b4d0dc37dee914bd7ca37324727058c2d0b.tar.gz | |
Add patch to system_info for building with MKL on Win32 #504
| -rw-r--r-- | numpy/distutils/system_info.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index c94fb607d..a12304230 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -811,9 +811,12 @@ class mkl_info(system_info): 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 @@ class lapack_mkl_info(mkl_info): 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) |