Date: Sun, 19 Mar 2017 00:41:08 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436459 - in head/math/py-numpy: . files Message-ID: <201703190041.v2J0f8Y5024417@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Sun Mar 19 00:41:08 2017 New Revision: 436459 URL: https://svnweb.freebsd.org/changeset/ports/436459 Log: - Remove dependency on math/openblas if other blas lib is selected PR: 215764 Submitted by: riggs@ Modified: head/math/py-numpy/Makefile head/math/py-numpy/files/patch-numpy-distutils-system_info.py Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Sun Mar 19 00:38:19 2017 (r436458) +++ head/math/py-numpy/Makefile Sun Mar 19 00:41:08 2017 (r436459) @@ -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=l 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 Modified: head/math/py-numpy/files/patch-numpy-distutils-system_info.py ============================================================================== --- head/math/py-numpy/files/patch-numpy-distutils-system_info.py Sun Mar 19 00:38:19 2017 (r436458) +++ head/math/py-numpy/files/patch-numpy-distutils-system_info.py Sun Mar 19 00:41:08 2017 (r436459) @@ -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')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703190041.v2J0f8Y5024417>