From owner-svn-ports-all@FreeBSD.ORG Sat Mar 28 19:41:44 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A7641810; Sat, 28 Mar 2015 19:41:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92A48DAE; Sat, 28 Mar 2015 19:41:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2SJfib4017649; Sat, 28 Mar 2015 19:41:44 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2SJfiIk017647; Sat, 28 Mar 2015 19:41:44 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201503281941.t2SJfiIk017647@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Sat, 28 Mar 2015 19:41:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382547 - in head/math/py-numpy: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2015 19:41:44 -0000 Author: demon Date: Sat Mar 28 19:41:43 2015 New Revision: 382547 URL: https://svnweb.freebsd.org/changeset/ports/382547 QAT: https://qat.redports.org/buildarchive/r382547/ Log: Allow to use OpenBLAS implementation of BLAS. Based on the work done by Eijiro Shibusawa , OpenBLAS port maintainer. Hide py-nose dependency under new TESTS option. Convert to USES=blaslapack. Differential Revision: D2060 Reviewed by: koobs, thierry Modified: head/math/py-numpy/Makefile head/math/py-numpy/files/site.cfg Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Sat Mar 28 19:37:02 2015 (r382546) +++ head/math/py-numpy/Makefile Sat Mar 28 19:41:43 2015 (r382547) @@ -18,16 +18,16 @@ COMMENT= The New Numeric Extension to Py LICENSE= BSD3CLAUSE -RUN_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose - USES= fortran python USE_PYTHON= concurrent distutils py3kplist LDFLAGS+= -shared -OPTIONS_DEFINE= ATLAS SUITESPARSE DOCS -OPTIONS_DEFAULT= SUITESPARSE -ATLAS_DESC= Use optimized blas library +OPTIONS_DEFINE= DOCS SUITESPARSE TESTS +OPTIONS_SINGLE= BLASLIB +OPTIONS_DEFAULT= NETLIB SUITESPARSE +OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPENBLAS SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse +TESTS_DESC= Install test suite requirements PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95 PYDISTUTILS_BUILDARGS+= --fcompiler=gnu95 @@ -36,10 +36,11 @@ PORTDOCS= * WRKSRC= ${WRKDIR}/${DISTNAME:S/r/rc/} DOCVERSION= 1.9.1 -ATLAS_LIB_DEPENDS= libatlas.so:${PORTSDIR}/math/atlas -ATLAS_LIB_DEPENDS_OFF= libblas.so:${PORTSDIR}/math/blas \ - liblapack.so:${PORTSDIR}/math/lapack +ATLAS_USES= blaslapack:atlas +NETLIB_USES= blaslapack:netlib +OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse +TESTS_RUN_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose .include @@ -55,10 +56,25 @@ post-patch: GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so// pre-configure: -.if ${PORT_OPTIONS:MATLAS} - @${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+alapack, f77blas, cblas, atlas+" ${WRKSRC}/site.cfg +.if ${PORT_OPTIONS:MOPENBLAS} + @${REINPLACE_CMD} -e "s+%%BLASNAME%%+openblas+" \ + -e "s+%%LIBRARIES%%+libraries+" \ + -e "s+%%LAPACKLIBS%%+%%BLASLIBS%%+" \ + -e "s+%%BLASLIBS%%+openblasp, gfortran+" \ + ${WRKSRC}/site.cfg +.elif ${PORT_OPTIONS:MATLAS} + @${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \ + -e "s+%%LIBRARIES%%+atlas_libs+" \ + -e "s+%%BLASLIBS%%+%%ATLASLIBS%%+" \ + -e "s+%%LAPACKLIBS%%+alapack+" \ + -e "s+%%ATLASLIBS%%+ptf77blas, ptcblas+" \ + ${WRKSRC}/site.cfg .else - @${REINPLACE_CMD} -e "s+%%ATLASLIBS%%+lapack, blas+" ${WRKSRC}/site.cfg + @${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \ + -e "s+%%LIBRARIES%%+atlas_libs+" \ + -e "s+%%BLASLIBS%%+blas+" \ + -e "s+%%LAPACKLIBS%%+lapack+" \ + ${WRKSRC}/site.cfg .endif .if !${PORT_OPTIONS:MSUITESPARSE} @${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg Modified: head/math/py-numpy/files/site.cfg ============================================================================== --- head/math/py-numpy/files/site.cfg Sat Mar 28 19:37:02 2015 (r382546) +++ head/math/py-numpy/files/site.cfg Sat Mar 28 19:41:43 2015 (r382547) @@ -1,10 +1,10 @@ [DEFAULT] -lapack_type=atlas library_dirs = /usr/lib:%%LOCALBASE%%/lib:%%GCCLIBDIR%% include_dirs = /usr/include:%%LOCALBASE%%/include:%%LOCALBASE%%/include/suitesparse src_dirs = %%LOCALBASE%%/src # search static libraries (.a) in preference to shared ones (.so) search_static_first = 0 -[atlas] -library_dirs = %%LOCALBASE%%/lib:%%GCCLIBDIR%% -atlas_libs = %%ATLASLIBS%% + +[%%BLASNAME%%] +%%LIBRARIES%% = %%BLASLIBS%% +lapack_libs = %%LAPACKLIBS%%