Attachment 210941 Details for Bug 243497 – Updated files/patch-numpy-distutils-system_info.py

Updated files/patch-numpy-distutils-system_info.py

patch-numpy-distutils-system_info.py (text/plain), 1.56 KB, created by rsmith on 2020-01-21 23:40:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rsmith

Created: 2020-01-21 23:40:33 UTC

Size: 1.56 KB

patch

obsolete

>--- numpy/distutils/system_info.py.orig	2019-08-27 15:01:36.000000000 +0200
>+++ numpy/distutils/system_info.py	2020-01-22 00:15:13.408470000 +0100
>@@ -172,6 +172,8 @@
>     Convert a python string into a literal suitable for inclusion into C code
>     """
>     # only these three characters are forbidden in C strings
>+    if s is None:
>+        return '"None"'
>     s = s.replace('\\', r'\\')
>     s = s.replace('"',  r'\"')
>     s = s.replace('\n', r'\n')
>@@ -1112,8 +1114,8 @@
>     dir_env_var = 'ATLAS'
>     _lib_names = ['f77blas', 'cblas']
>     if sys.platform[:7] == 'freebsd':
>-        _lib_atlas = ['atlas_r']
>-        _lib_lapack = ['alapack_r']
>+        _lib_atlas = ['atlas']
>+        _lib_lapack = ['alapack']
>     else:
>         _lib_atlas = ['atlas']
>         _lib_lapack = ['lapack']
>@@ -1633,11 +1635,6 @@
>             self.set_info(**blis_info)
>             return
> 
>-        openblas_info = get_info('openblas')
>-        if openblas_info:
>-            self.set_info(**openblas_info)
>-            return
>-
>         atlas_info = get_info('atlas_3_10_blas_threads')
>         if not atlas_info:
>             atlas_info = get_info('atlas_3_10_blas')
>@@ -1742,7 +1739,7 @@
>                                       library_dirs=info['library_dirs'],
>                                       extra_postargs=info.get('extra_link_args', []))
>                     res = "blas"
>-            except distutils.ccompiler.CompileError:
>+            except (distutils.ccompiler.CompileError, distutils.ccompiler.LinkError):
>                 res = None
>         finally:
>             shutil.rmtree(tmpdir)

Actions: View

Attachments on bug 243497: 210941 | 210969 | 210971 | 210997 | 211000