diff options
| author | Wen Heping <wen@FreeBSD.org> | 2017-03-19 00:41:08 +0000 |
|---|---|---|
| committer | Wen Heping <wen@FreeBSD.org> | 2017-03-19 00:41:08 +0000 |
| commit | 393077c8f4a1fd59ebed3737782df10180b3ac51 (patch) | |
| tree | 18c822a9e45aa979989880899bcf76f57197dafd /math/py-numpy | |
| parent | - Update to 0.19.0 (diff) | |
- Remove dependency on math/openblas if other blas lib is selected
PR: 215764
Submitted by: riggs@
Notes
Notes:
svn path=/head/; revision=436459
Diffstat (limited to 'math/py-numpy')
| -rw-r--r-- | math/py-numpy/Makefile | 5 | ||||
| -rw-r--r-- | math/py-numpy/files/patch-numpy-distutils-system_info.py | 18 |
2 files changed, 17 insertions, 6 deletions
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 4889643520f6..4f250c53a2eb 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -3,7 +3,7 @@ PORTNAME= numpy PORTVERSION= 1.11.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP:source \ @@ -41,8 +41,7 @@ GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran. ATLAS_USES= blaslapack:atlas NETLIB_USES= blaslapack:netlib -NETLIB_LIB_DEPENDS= libcblas.so:math/cblas \ - libopenblas.so:math/openblas +NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose diff --git a/math/py-numpy/files/patch-numpy-distutils-system_info.py b/math/py-numpy/files/patch-numpy-distutils-system_info.py index c71c7f922b03..20864eb025d2 100644 --- a/math/py-numpy/files/patch-numpy-distutils-system_info.py +++ b/math/py-numpy/files/patch-numpy-distutils-system_info.py @@ -1,6 +1,6 @@ ---- numpy/distutils/system_info.py.orig 2013-02-09 22:04:56.000000000 +0100 -+++ numpy/distutils/system_info.py 2013-03-22 21:01:34.000000000 +0100 -@@ -995,8 +995,8 @@ +--- numpy/distutils/system_info.py.orig 2016-10-03 23:42:24 UTC ++++ numpy/distutils/system_info.py +@@ -1038,8 +1038,8 @@ class atlas_info(system_info): dir_env_var = 'ATLAS' _lib_names = ['f77blas', 'cblas'] if sys.platform[:7] == 'freebsd': @@ -11,3 +11,15 @@ else: _lib_atlas = ['atlas'] _lib_lapack = ['lapack'] +@@ -1574,11 +1574,6 @@ class blas_opt_info(system_info): + self.set_info(**blas_mkl_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') |