From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RzcY6-0002dK-Qi for garchives@archives.gentoo.org; Mon, 20 Feb 2012 23:21:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 199ABE0B7E; Mon, 20 Feb 2012 23:21:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C3CE9E0B7E for ; Mon, 20 Feb 2012 23:21:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF1B21B4014 for ; Mon, 20 Feb 2012 23:21:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 896BDE53FF for ; Mon, 20 Feb 2012 23:21:27 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1329780076.7461839a9ec9e89f3479dbe95fff4414c60870a1.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/atlas/ChangeLog sci-libs/atlas/atlas-3.9.63.ebuild sci-libs/atlas/atlas-3.9.67.ebuild X-VCS-Directories: sci-libs/atlas/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 7461839a9ec9e89f3479dbe95fff4414c60870a1 X-VCS-Branch: master Date: Mon, 20 Feb 2012 23:21:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6e56ed4d-7c0e-4cd0-b27f-30d69d1bfb71 X-Archives-Hash: 8e988034843a85eaf45798180cd38b86 commit: 7461839a9ec9e89f3479dbe95fff4414c60870a1 Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Mon Feb 20 23:21:16 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Mon Feb 20 23:21:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D7461839a sci-libs/atlas: Reverted to older lapack (Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit) --- sci-libs/atlas/ChangeLog | 4 + sci-libs/atlas/atlas-3.9.63.ebuild | 271 ------------------------------= ------ sci-libs/atlas/atlas-3.9.67.ebuild | 5 +- 3 files changed, 6 insertions(+), 274 deletions(-) diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog index d0d6ed2..206d35c 100644 --- a/sci-libs/atlas/ChangeLog +++ b/sci-libs/atlas/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 20 Feb 2012; S=C3=A9bastien Fabbro -atlas-3.9.63= .ebuild, + atlas-3.9.67.ebuild: + Reverted to older lapack + *atlas-3.9.67 (16 Feb 2012) =20 16 Feb 2012; S=C3=A9bastien Fabbro -atlas-3.9.52= .ebuild, diff --git a/sci-libs/atlas/atlas-3.9.63.ebuild b/sci-libs/atlas/atlas-3.= 9.63.ebuild deleted file mode 100644 index a3975eb..0000000 --- a/sci-libs/atlas/atlas-3.9.63.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D4 -inherit eutils toolchain-funcs versionator alternatives-2 - -LAPACKP=3Dlapack-3.4.0 - -DESCRIPTION=3D"Automatically Tuned Linear Algebra Software" -HOMEPAGE=3D"http://math-atlas.sourceforge.net/" -SRC_URI=3D"mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 - fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP}.tgz ) )" - -LICENSE=3D"BSD" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86 ~amd64-linux" -IUSE=3D"fortran doc lapack static-libs threads" - -RDEPEND=3D"fortran? ( virtual/fortran )" -DEPEND=3D"${RDEPEND} - !prefix? ( sys-power/cpufrequtils )" - -S=3D"${WORKDIR}/ATLAS" - -atlas_configure() { - # hack needed to trick the flaky gcc detection - local mycc=3D"$(tc-getCC)" - [[ ${mycc} =3D=3D *gcc* ]] && mycc=3Dgcc - - local myconf=3D( - "--prefix=3D${ED}/usr" - "--libdir=3D${ED}/usr/$(get_libdir)" - "--incdir=3D${ED}/usr/include" - "--cc=3D${mycc}" - "-C ac ${mycc}" - "-D c -DWALL" - "-F ac '${CFLAGS}'" - "-Ss pmake '\$(MAKE) ${MAKEOPTS}'" - ) - - # OpenMP shown to decreased performance over POSIX threads - # (at least in 3.9.x, see atlas-dev mailing list) - if use threads; then - myconf+=3D( "-t -1" "-Si omp 0" ) - else - myconf+=3D( "-t 0" "-Si omp 0" ) - fi - - if use amd64 || use ppc64 || use sparc; then - if [ ${ABI} =3D amd64 ] || [ ${ABI} =3D ppc64 ] || [ ${ABI} =3D sparc6= 4 ] ; then - myconf+=3D( "-b 64" ) - elif [ ${ABI} =3D x86 ] || [ ${ABI} =3D ppc ] || [ ${ABI} =3D sparc32 = ] ; then - myconf+=3D( "-b 32" ) - else - myconf+=3D( "-b 64" ) - fi - elif use ppc || use x86; then - myconf+=3D( "-b 32" ) - elif use ia64; then - myconf+=3D( "-b 64" ) - else #hppa alpha ... - myconf+=3D( "" ) - fi - if use fortran; then - myconf+=3D( - "-C if $(tc-getFC)" - "-F if '${FFLAGS}'" - ) - if use lapack; then - myconf+=3D( - "-Si latune 1" - "--with-netlib-lapack-tarfile=3D${DISTDIR}/${LAPACKP}.tgz" - ) - else - myconf+=3D( "-Si latune 0" ) - fi - else - myconf+=3D( "-Si latune 0" "--nof77" ) - fi - local confdir=3D"${S}_${1}"; shift - myconf+=3D( $@ ) - mkdir "${confdir}" && cd "${confdir}" - # for debugging - echo ${myconf[@]} > myconf.out - "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed" -} - -atlas_compile() { - pushd "${S}_${1}" > /dev/null - # atlas does its own parallel builds - emake -j1 build - cd lib - emake libclapack.a - [[ -e libptcblas.a ]] && emake libptclapack.a - popd > /dev/null -} - -# transform a static archive into a shared library and install them -# atlas_install_libs [extra link flags] -atlas_install_libs() { - local libname=3D$(basename ${1%.*}) - einfo "Installing ${libname}" - local soname=3D${libname}.so.$(get_major_version) - shift - pushd "${S}_shared"/lib > /dev/null - ${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=3D${soname} \ - -Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \ - "$@" -o ${soname} || die "Creating ${soname} failed" - dolib.so ${soname} - ln -s ${soname} ${soname%.*} - dosym ${soname} /usr/$(get_libdir)/${soname%.*} - popd > /dev/null - use static-libs && dolib.a "${S}_static"/lib/${libname}.a -} - -# create and install a pkgconfig file -# atlas_install_pc [extra link flags] -atlas_install_pc() { - local libname=3D${1} ; shift - local pcname=3D${1} ; shift - cat <<-EOF > ${pcname}.pc - prefix=3D${EPREFIX}/usr - libdir=3D\${prefix}/$(get_libdir) - includedir=3D\${prefix}/include - Name: ${pcname} - Description: ${PN} ${pcname} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -l${libname} $@ - Cflags: -I\${includedir}/${PN} - ${PCREQ} - EOF - insinto /usr/$(get_libdir)/pkgconfig - doins ${pcname}.pc -} - -pkg_setup() { - if [[ -n $(type -P cpufreq-info) ]]; then - [[ -z $(cpufreq-info -d) ]] && return - local ncpu=3D$(LANG=3DC cpufreq-info | grep -c "analyzing CPU") - local cpu=3D0 - while [[ ${cpu} -lt ${ncpu} ]]; do - if ! $(LANG=3DC cpufreq-info -p -c ${cpu} | grep -q performance); the= n - ewarn "CPU $cpu is not set to performance" - ewarn "Run cpufreq-set -r -g performance as root" - die "${PN} needs all cpu set to performance" - fi - cpu=3D$(( cpu + 1 )) - done - else - ewarn "Please make sure to disable CPU throttling completely" - ewarn "during the compile of ${PN}. Otherwise, all ${PN}" - ewarn "generated timings will be completely random and the" - ewarn "performance of the resulting libraries will be degraded" - ewarn "considerably." - fi -} - -src_prepare() { - epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch - epatch "${FILESDIR}"/3.9.63-leaks.patch -} - -src_configure() { - atlas_configure shared "-Fa alg -fPIC" - use static-libs && atlas_configure static -} - -src_compile() { - atlas_compile shared - use static-libs && atlas_compile static -} - -src_test() { - cd "${S}_shared" - emake -j1 check - emake -j1 time -} - -src_install() { - cd "${S}_shared/lib" - # rename to avoid collision with other packages - local l - for l in {,c}{blas,lapack}; do - if [[ -e lib${l}.a ]]; then - mv lib{,atl}${l}.a - use static-libs && mv "${S}"_static/lib/lib{,atl}${l}.a - fi - done - - [[ -e libptcblas.a ]] && PTLIBS=3D"-lpthread" - - # atlas - atlas_install_libs libatlas.a -lm ${PTLIBS} - - # cblas - atlas_install_libs libatlcblas.a -lm -L. -latlas - atlas_install_pc atlcblas atlas-cblas -lm -latlas - alternatives_for cblas atlas 0 \ - /usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas.pc \ - /usr/include/cblas.h atlas/cblas.h - - # cblas threaded - if [[ -e libptcblas.a ]]; then - atlas_install_libs libptcblas.a -lm -L. -latlas ${PTLIBS} - atlas_install_pc ptcblas atlas-cblas-threads -lm -latlas ${PTLIBS} - alternatives_for cblas atlas-threads 0 \ - /usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas-threads.pc \ - /usr/include/cblas.h atlas/cblas.h - fi - - if use lapack; then - PCREQ=3D"Requires: cblas" - # clapack - atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas - atlas_install_pc atlclapack atlas-clapack -lm -latlas - - # clapack threaded - if [[ -e libptclapack.a ]]; then - atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS} - atlas_install_pc ptclapack atlas-clapack-threads -lm -latlas ${PTLIBS= } - fi - fi - - if use fortran; then - LINK=3D$(tc-getF77) PCREQ=3D - # blas - atlas_install_libs libf77blas.a -lm -L. -latlas - atlas_install_pc f77blas atlas-blas -lm -latlas - alternatives_for blas atlas 0 \ - /usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas.pc - - # blas threaded - if [[ -e libptf77blas.a ]]; then - atlas_install_libs libptf77blas.a -lm -L. -latlas ${PTLIBS} - atlas_install_pc ptf77blas atlas-blas-threads -lm -latlas ${PTLIBS} - alternatives_for blas atlas-threads 0 \ - /usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc - fi - - if use lapack; then - PCREQ=3D"Requires: blas cblas" - # lapack - atlas_install_libs libatllapack.a \ - -lm -L. -latlas -latlcblas -lf77blas - atlas_install_pc atllapack atlas-lapack -lm -latlas - alternatives_for lapack atlas 0 \ - /usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack.pc - # lapack threaded - if [[ -e libptlapack.a ]]; then - atlas_install_libs libptlapack.a \ - -lm -L. -latlas -lptcblas -lptf77blas ${PTLIBS} - atlas_install_pc ptlapack atlas-lapack-threads \ - -lm -latlas ${PTLIBS} - alternatives_for lapack atlas-threads 0 \ - /usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc - fi - fi - fi - - cd "${S}" - insinto /usr/include/${PN} - doins include/*.h - - cd "${S}/doc" - dodoc INDEX.txt AtlasCredits.txt ChangeLog - use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf - use doc && use fortran && dodoc f77blas*pdf - use doc && use fortran && use lapack && dodoc lapack*pdf -} diff --git a/sci-libs/atlas/atlas-3.9.67.ebuild b/sci-libs/atlas/atlas-3.= 9.67.ebuild index 7292674..b2a010a 100644 --- a/sci-libs/atlas/atlas-3.9.67.ebuild +++ b/sci-libs/atlas/atlas-3.9.67.ebuild @@ -5,13 +5,12 @@ EAPI=3D4 inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 =20 -LAPACKP=3Dlapack-3.4.0_p20120215.tar.bz2 +LAPACKP=3Dlapack-3.4.0.tgz =20 DESCRIPTION=3D"Automatically Tuned Linear Algebra Software" HOMEPAGE=3D"http://math-atlas.sourceforge.net/" SRC_URI=3D"mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2 - fortran? ( lapack? ( http://dev.gentoo.org/~bicatali/distfiles/${LAPACK= P} ) )" -# fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP} ) )" + fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP} ) )" =20 LICENSE=3D"BSD" SLOT=3D"0"