diff options
| author | bacon <bacon@pkgsrc.org> | 2020-10-12 21:51:57 +0000 |
|---|---|---|
| committer | bacon <bacon@pkgsrc.org> | 2020-10-12 21:51:57 +0000 |
| commit | afefcaa6e54efd2e5b8f95abf655d5d040ae36be (patch) | |
| tree | 301b42c86078439d0507aa5e1cb691c3fb6da5d2 /math/py-numpy16 | |
| parent | 064b357d6f40e50256ec30d40eeb2381a21baa63 (diff) | |
| download | pkgsrc-afefcaa6e54efd2e5b8f95abf655d5d040ae36be.tar.gz | |
math/blas, math/lapack: Install interchangeable BLAS system
Install the new interchangeable BLAS system created by Thomas Orgis,
currently supporting Netlib BLAS/LAPACK, OpenBLAS, cblas, lapacke, and
Apple's Accelerate.framework. This system allows the user to select any
BLAS implementation without modifying packages or using package options, by
setting PKGSRC_BLAS_TYPES in mk.conf. See mk/blas.buildlink3.mk for details.
This commit should not alter behavior of existing packages as the system
defaults to Netlib BLAS/LAPACK, which until now has been the only supported
implementation.
Details:
Add new mk/blas.buildlink3.mk for inclusion in dependent packages
Install compatible Netlib math/blas and math/lapack packages
Update math/blas and math/lapack MAINTAINER approved by adam@
OpenBLAS, cblas, and lapacke will follow in separate commits
Update direct dependents to use mk/blas.buildlink3.mk
Perform recursive revbump
Diffstat (limited to 'math/py-numpy16')
| -rw-r--r-- | math/py-numpy16/Makefile | 7 | ||||
| -rw-r--r-- | math/py-numpy16/patches/patch-numpy_distutils_system__info.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/math/py-numpy16/Makefile b/math/py-numpy16/Makefile index 610a9a18b95..839de014646 100644 --- a/math/py-numpy16/Makefile +++ b/math/py-numpy16/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2020/08/05 13:47:43 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2020/10/12 21:52:03 bacon Exp $ DISTNAME= numpy-1.16.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= math python MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} EXTRACT_SUFX= .zip @@ -58,9 +59,9 @@ BUILDLINK_API_DEPENDS.py-cython+= ${PYPKGPREFIX}-cython>=0.29.2 .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../lang/python/versioned_dependencies.mk" +# Consider allowing mk/blas.buildlink3.mk to handle Accelerate.framework .if ${OPSYS} != "Darwin" # blas and lapack are not needed; numpy will use Accelerate.framework -.include "../../math/blas/buildlink3.mk" -.include "../../math/lapack/buildlink3.mk" +.include "../../mk/blas.buildlink3.mk" .endif .include "../../mk/bsd.pkg.mk" diff --git a/math/py-numpy16/patches/patch-numpy_distutils_system__info.py b/math/py-numpy16/patches/patch-numpy_distutils_system__info.py index c32a8a4f824..66d8ddb065f 100644 --- a/math/py-numpy16/patches/patch-numpy_distutils_system__info.py +++ b/math/py-numpy16/patches/patch-numpy_distutils_system__info.py @@ -1,6 +1,6 @@ -$NetBSD: patch-numpy_distutils_system__info.py,v 1.1 2020/04/27 16:52:56 adam Exp $ +$NetBSD: patch-numpy_distutils_system__info.py,v 1.2 2020/10/12 21:52:03 bacon Exp $ -Disable openblas detection. In pkgsrc, py-numpy should use math/blas. +Disable openblas detection. In pkgsrc, use mk/blas.buildlink.mk. --- numpy/distutils/system_info.py.orig 2018-04-02 21:18:11.535155000 +0000 +++ numpy/distutils/system_info.py |