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

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

pr-numpy-try-openblass-too.diff (text/plain), 2.79 KB, created by John Hein on 2020-01-23 22:18:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2020-01-23 22:18:40 UTC

Size: 2.79 KB

patch

obsolete

>Index: files/patch-numpy-distutils-system_info.py
>===================================================================
>--- files/patch-numpy-distutils-system_info.py	(revision 523944)
>+++ files/patch-numpy-distutils-system_info.py	(working copy)
>@@ -1,4 +1,4 @@
>---- numpy/distutils/system_info.py.orig	2019-08-27 19:01:36 UTC
>+--- numpy/distutils/system_info.py.orig	2019-08-27 21:01:36 UTC
> +++ numpy/distutils/system_info.py
> @@ -172,6 +172,8 @@ def _c_string_literal(s):
>      Convert a python string into a literal suitable for inclusion into C code
>@@ -32,12 +32,33 @@
>          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 @@ class blas_info(system_info):
>-                                       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):
>+@@ -1730,18 +1727,17 @@ 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"
>++                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:
>                  res = None
>          finally:
>-             shutil.rmtree(tmpdir)

Actions: View | Diff

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