Attachment 210997 Details for Bug 243497 – [patch] add openblas to list of cblas compatible libs to check

[patch] [patch] add openblas to list of cblas compatible libs to check

pr-numpy-try-openblass-too.diff (text/plain), 3.21 KB, created by John Hein on 2020-01-23 21:21:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2020-01-23 21:21:38 UTC

Size: 3.21 KB

patch

obsolete

>Index: files/patch-numpy-distutils-system_info.py
>===================================================================
>--- files/patch-numpy-distutils-system_info.py	(revision 523923)
>+++ files/patch-numpy-distutils-system_info.py	(working copy)
>@@ -1,6 +1,6 @@
>---- numpy/distutils/system_info.py.orig	2019-01-31 02:31:08 UTC
>+--- numpy/distutils/system_info.py.orig	2019-08-27 21:01:36 UTC
> +++ numpy/distutils/system_info.py
>-@@ -169,6 +169,8 @@ def _c_string_literal(s):
>+@@ -172,6 +172,8 @@ def _c_string_literal(s):
>      Convert a python string into a literal suitable for inclusion into C code
>      """
>      # only these three characters are forbidden in C strings
>@@ -9,7 +9,7 @@
>      s = s.replace('\\', r'\\')
>      s = s.replace('"',  r'\"')
>      s = s.replace('\n', r'\n')
>-@@ -1109,8 +1111,8 @@ class atlas_info(system_info):
>+@@ -1112,8 +1114,8 @@ class atlas_info(system_info):
>      dir_env_var = 'ATLAS'
>      _lib_names = ['f77blas', 'cblas']
>      if sys.platform[:7] == 'freebsd':
>@@ -20,7 +20,7 @@
>      else:
>          _lib_atlas = ['atlas']
>          _lib_lapack = ['lapack']
>-@@ -1630,11 +1632,6 @@ class blas_opt_info(system_info):
>+@@ -1633,11 +1635,6 @@ class blas_opt_info(system_info):
>              self.set_info(**blis_info)
>              return
>  
>@@ -32,3 +32,35 @@
>          atlas_info = get_info('atlas_3_10_blas_threads')
>          if not atlas_info:
>              atlas_info = get_info('atlas_3_10_blas')
>+@@ -1730,19 +1727,18 @@ class blas_info(system_info):
>+                 # check we can link (find library)
>+                 # some systems have separate cblas and blas libs. First
>+                 # check for cblas lib, and if not present check for blas lib.
>+-                try:
>+-                    c.link_executable(obj, os.path.join(tmpdir, "a.out"),
>+-                                      libraries=["cblas"],
>+-                                      library_dirs=info['library_dirs'],
>+-                                      extra_postargs=info.get('extra_link_args', []))
>+-                    res = "cblas"
>+-                except distutils.ccompiler.LinkError:
>+-                    c.link_executable(obj, os.path.join(tmpdir, "a.out"),
>+-                                      libraries=["blas"],
>+-                                      library_dirs=info['library_dirs'],
>+-                                      extra_postargs=info.get('extra_link_args', []))
>+-                    res = "blas"
>+-            except distutils.ccompiler.CompileError:
>++                res = None
>++                for libname in ['cblas', 'blas', 'openblas']:
>++                    try:
>++                        c.link_executable(obj, os.path.join(tmpdir, "a.out"),
>++                                          libraries=[libname],
>++                                          library_dirs=info['library_dirs'],
>++                                          extra_postargs=info.get('extra_link_args', []))
>++                        res = libname
>++                        break
>++                    except distutils.ccompiler.LinkError:
>++                        pass
>++            except (distutils.ccompiler.CompileError, distutils.ccompiler.LinkError):
>+                 res = None
>+         finally:
>+             shutil.rmtree(tmpdir)

Actions: View | Diff

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