diff options
author | Markus Dittrich <markusle@gentoo.org> | 2010-02-19 02:36:43 +0000 |
---|---|---|
committer | Markus Dittrich <markusle@gentoo.org> | 2010-02-19 02:36:43 +0000 |
commit | c5e908d3fadbfdca442e7e343fd0d1661d3a8c6b (patch) | |
tree | f6c7d67dd6e8a893a395b1181e80cf0516b9af6c /sci-libs | |
parent | Automated update of use.local.desc (diff) | |
download | historical-c5e908d3fadbfdca442e7e343fd0d1661d3a8c6b.tar.gz historical-c5e908d3fadbfdca442e7e343fd0d1661d3a8c6b.tar.bz2 historical-c5e908d3fadbfdca442e7e343fd0d1661d3a8c6b.zip |
Version bump.
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/blas-atlas/ChangeLog | 9 | ||||
-rw-r--r-- | sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild | 241 | ||||
-rw-r--r-- | sci-libs/blas-atlas/files/atlas-3.9.23-ger-fix.patch | 12 | ||||
-rw-r--r-- | sci-libs/lapack-atlas/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild | 195 |
5 files changed, 463 insertions, 2 deletions
diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog index a34defbb67d4..381c91bf9540 100644 --- a/sci-libs/blas-atlas/ChangeLog +++ b/sci-libs/blas-atlas/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/blas-atlas # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.96 2010/02/06 17:08:34 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.97 2010/02/19 02:35:21 markusle Exp $ + +*blas-atlas-3.9.23 (18 Feb 2010) + + 18 Feb 2010; Markus Dittrich <markusle@gentoo.org> + +blas-atlas-3.9.23.ebuild, +files/atlas-3.9.23-ger-fix.patch: + Version bump. This also fixes a regression in GER tuning code + (ID 2953608 on atlas' sourceforge issue tracker). *blas-atlas-3.9.21-r1 (06 Feb 2010) diff --git a/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild b/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild new file mode 100644 index 000000000000..31938004ccaf --- /dev/null +++ b/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.9.23.ebuild,v 1.1 2010/02/19 02:35:21 markusle Exp $ + +inherit eutils toolchain-funcs fortran multilib + +DESCRIPTION="Automatically Tuned Linear Algebra Software BLAS implementation" +HOMEPAGE="http://math-atlas.sourceforge.net/" +MY_PN=${PN/blas-/} +PATCH_V="3.9.21" +SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2 + mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc" + +RDEPEND="app-admin/eselect-blas + app-admin/eselect-cblas + doc? ( app-doc/blas-docs )" +DEPEND="app-admin/eselect-blas + app-admin/eselect-cblas + >=sys-devel/libtool-1.5" + +S="${WORKDIR}/ATLAS" + +pkg_setup() { + # icc won't compile (as of icc-10.0.026) + # and will blow out $PORTAGE_TMPDIR + if [[ $(tc-getCC) = icc* ]]; then + eerror "icc compiler is not supported with sci-libs/blas-atlas" + die "blas-atlas won't compile with icc" + fi + + FORTRAN="g77 gfortran ifc" + fortran_pkg_setup + echo + ewarn "Please make sure to disable CPU throttling completely" + ewarn "during the compile of blas-atlas. Otherwise, all atlas" + ewarn "generated timings will be completely random and the" + ewarn "performance of the resulting libraries will be degraded" + ewarn "considerably." + echo + ewarn "For users of <=gcc-4.1 only:" + ewarn "If you experience failing SANITY tests during" + ewarn "atlas' compile please try passing -mfpmath=387; this" + ewarn "option might also result in much better performance" + ewarn "than using then sse instruction set depending on your" + ewarn "CPU." + echo + ewarn "If blas-atlas fails during linking with a message" + ewarn "'relocation R_X86_64_32 .... recompile with -fPIC.'" + ewarn "please re-emerge libtool and then try again." + echo + epause 5 +} + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2 + epatch "${FILESDIR}"/${MY_PN}-${PV}-ger-fix.patch + epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch + + BLD_DIR="${S}"/gentoo-build + mkdir "${BLD_DIR}" || die "failed to generate build directory" + cd "${BLD_DIR}" + cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war" + + local archselect= + if use amd64 || use ppc64; then + archselect="-b 64" + elif use alpha; then + archselect="" + else + archselect="-b 32" + fi + + # Remove -m64 on alpha, since the compiler doesn't support it + use alpha && sed -i -e 's/-m64//g' "${S}"/CONFIG/src/probe_comp.c + + # unfortunately, atlas-3.9.0 chokes when passed + # x86_64-pc-linux-gnu-gcc and friends instead of + # plain gcc. Hence, we'll have to workaround this + # until it is fixed by upstream + local c_compiler=$(tc-getCC) + if [[ "${c_compiler}" == *gcc* ]]; then + c_compiler="gcc" + fi + + ../configure \ + --cc="${c_compiler}" \ + --cflags="${CFLAGS}" \ + --prefix="${D}/${DESTTREE}" \ + --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ + --incdir="${D}/${DESTTREE}"/include \ + -C ac "${c_compiler}" -F ac "${CFLAGS}" \ + -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ + -Si cputhrchk 0 ${archselect} \ + || die "configure failed" + + # fix LDFLAGS + sed -e "s|LDFLAGS =.*|LDFLAGS = ${LDFLAGS}|" \ + -i "${BLD_DIR}"/Make.inc +} + +src_compile() { + cd "${BLD_DIR}" + + # atlas does its own parallel builds + # â and it fails parallel make, bug #294172 + emake -j1 || die "emake failed" + + RPATH="${DESTTREE}"/$(get_libdir)/blas + emake -j1 \ + LIBDIR=$(get_libdir) \ + RPATH="${RPATH}"/atlas \ + shared || die "failed to build shared libraries" + + # build shared libraries of threaded libraries if applicable + if [[ -d gentoo/libptcblas.a ]]; then + emake -j1 \ + LIBDIR=$(get_libdir) \ + RPATH="${RPATH}"/threaded-atlas \ + ptshared || die "failed to build threaded shared libraries" + fi +} + +src_test() { + # make check does not work because + # we don't build lapack libs + for i in F77 C; do + einfo "Testing ${i} interface" + cd "${BLD_DIR}"/interfaces/blas/${i}/testing + make sanity_test || die "emake tests for ${i} failed" + if [[ -d "${BLD_DIR}"/gentoo/libptf77blas.a ]]; then + make ptsanity_test || die "emake tests threaded for ${i}failed" + fi + done + echo "Timing ATLAS" + cd "${BLD_DIR}" + emake time || die "emake time failed" +} + +src_install () { + dodir "${RPATH}"/atlas + cd "${BLD_DIR}"/gentoo/libs + cp -P libatlas* "${D}/${DESTTREE}"/$(get_libdir) \ + || die "Failed to install libatlas" + + # pkgconfig files + local extlibs="-lm" + local threadlibs + [[ ${FORTRANC} == gfortran ]] && extlibs="${extlibs} -lgfortran" + [[ ${FORTRANC} == g77 ]] && extlibs="${extlibs} -lg2c" + cp "${FILESDIR}"/blas.pc.in blas.pc + cp "${FILESDIR}"/cblas.pc.in cblas.pc + sed -i \ + -e "s:@LIBDIR@:$(get_libdir)/blas/atlas:" \ + -e "s:@PV@:${PV}:" \ + -e "s:@EXTLIBS@:${extlibs}:g" \ + -e "s:@THREADLIBS@:${threadlibs}:g" \ + *blas.pc || die "sed *blas.pc failed" + + cp -P *blas* "${D}/${RPATH}"/atlas \ + || die "Failed to install blas/cblas" + + ESELECT_PROF=atlas + eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.atlas ${ESELECT_PROF} + eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.atlas ${ESELECT_PROF} + + if [[ -d "${BLD_DIR}"/gentoo/threaded-libs ]]; then + dodir "${RPATH}"/threaded-atlas + cd "${BLD_DIR}"/gentoo/threaded-libs + + # pkgconfig files + cp "${FILESDIR}"/blas.pc.in blas.pc + cp "${FILESDIR}"/cblas.pc.in cblas.pc + threadlibs="-lpthread" + sed -i \ + -e "s:@LIBDIR@:$(get_libdir)/blas/threaded-atlas:" \ + -e "s:@PV@:${PV}:" \ + -e "s:@EXTLIBS@:${extlibs}:g" \ + -e "s:@THREADLIBS@:${threadlibs}:g" \ + *blas.pc || die "sed *blas.pc failed" + + cp -P * "${D}/${RPATH}"/threaded-atlas \ + || die "Failed to install threaded atlas" + ESELECT_PROF=atlas-threads + + eselect blas add $(get_libdir) "${FILESDIR}"/eselect.blas.threaded-atlas ${ESELECT_PROF} + eselect cblas add $(get_libdir) "${FILESDIR}"/eselect.cblas.threaded-atlas ${ESELECT_PROF} + fi + + insinto "${DESTTREE}"/include/atlas + doins \ + "${S}"/include/cblas.h \ + "${S}"/include/atlas_misc.h \ + "${S}"/include/atlas_enum.h \ + "${S}"/include/atlas_aux.h \ + || die "failed to install headers" + + # These headers contain the architecture-specific + # optimizations determined by ATLAS. The atlas-lapack build + # is much shorter if they are available, so save them: + doins "${BLD_DIR}"/include/*.h \ + || die "failed to install timing headers" + + # some docs + cd "${S}"/doc + dodoc INDEX.txt AtlasCredits.txt ChangeLog || die "dodoc failed" + # atlas specific doc (blas generic docs installed by blas-docs) + if use doc; then + insinto /usr/share/doc/${PF} + doins atlas*pdf cblasqref.pdf || die "doins docs failed" + fi +} + +pkg_postinst() { + for p in blas cblas; do + local current_p=$(eselect ${p} show | cut -d' ' -f2) + # this snippet works around the eselect bug #189942 and makes + # sure that users upgrading from a previous blas-atlas + # version pick up the new pkg-config files + if [[ ${current_p} == ${ESELECT_PROF} \ + || ${current_p} == "threaded-atlas" \ + || -z ${current_p} ]]; then + local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config + [[ -e ${configfile} ]] && rm -f ${configfile} + eselect ${p} set ${ESELECT_PROF} + elog "${p} has been eselected to ${ESELECT_PROF}" + else + elog "Current eselected ${p} is ${current_p}" + elog "To use the ${p} ${ESELECT_PROF} implementation, you have to issue (as root):" + elog "\t eselect ${p} set ${ESELECT_PROF}" + fi + done +} diff --git a/sci-libs/blas-atlas/files/atlas-3.9.23-ger-fix.patch b/sci-libs/blas-atlas/files/atlas-3.9.23-ger-fix.patch new file mode 100644 index 000000000000..c12a83f9dbb5 --- /dev/null +++ b/sci-libs/blas-atlas/files/atlas-3.9.23-ger-fix.patch @@ -0,0 +1,12 @@ +diff -Naur ATLAS/tune/blas/ger/r1hgen.c ATLAS.new/tune/blas/ger/r1hgen.c +--- ATLAS/tune/blas/ger/r1hgen.c 2010-02-07 19:41:01.000000000 -0500 ++++ ATLAS.new/tune/blas/ger/r1hgen.c 2010-02-18 11:54:46.000000000 -0500 +@@ -1030,7 +1030,7 @@ + r1b->XU = xu; + r1b->YU = yu; + r1b->flag = iflag; +- r1b->CacheElts = l1mul * GetL1CacheElts(pre); ++ r1b->CacheElts = (l1mul/100.0) * GetL1CacheElts(pre); + r1hgen(pre, path, -1, r1b, NULL); + exit(0); + } diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog index 092e711d7dad..9e314d5e3001 100644 --- a/sci-libs/lapack-atlas/ChangeLog +++ b/sci-libs/lapack-atlas/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/lapack-atlas # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.77 2010/02/06 17:09:49 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.78 2010/02/19 02:36:43 markusle Exp $ + +*lapack-atlas-3.9.23 (18 Feb 2010) + + 18 Feb 2010; Markus Dittrich <markusle@gentoo.org> + +lapack-atlas-3.9.23.ebuild: + Version bump. *lapack-atlas-3.9.21-r1 (06 Feb 2010) diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild new file mode 100644 index 000000000000..a4c92899b4df --- /dev/null +++ b/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.9.23.ebuild,v 1.1 2010/02/19 02:36:43 markusle Exp $ + +inherit eutils flag-o-matic toolchain-funcs fortran autotools versionator + +MY_PN="${PN/lapack-/}" +PATCH_V="3.9.21" +L_PN="lapack" +L_PV="3.1.1" +BlasRelease=$(get_version_component_range 1-3) + +DESCRIPTION="F77 and C LAPACK implementations using available ATLAS routines" +LICENSE="BSD" +HOMEPAGE="http://math-atlas.sourceforge.net/" +SRC_URI1="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2" +SRC_URI2="http://www.netlib.org/${L_PN}/${L_PN}-lite-${L_PV}.tgz" +SRC_URI="${SRC_URI1} ${SRC_URI2} + mirror://gentoo/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2 + mirror://gentoo/${L_PN}-reference-${L_PV}-autotools.patch.bz2" + +SLOT="0" +IUSE="doc" +KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" + +CDEPEND="virtual/blas + virtual/cblas + app-admin/eselect-lapack + ~sci-libs/blas-atlas-${BlasRelease}" +DEPEND="${CDEPEND} + dev-util/pkgconfig + >=sys-devel/libtool-1.5" +RDEPEND="${CDEPEND} + doc? ( app-doc/lapack-docs )" + +FORTRAN="g77 gfortran ifc" + +S="${WORKDIR}/ATLAS" +S_LAPACK="${WORKDIR}/${L_PN}-lite-${L_PV}" +BLD_DIR="${S}/gentoo-build" +RPATH="${DESTTREE}/$(get_libdir)/${L_PN}/${MY_PN}" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.2.patch.bz2 + epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch + epatch "${FILESDIR}"/${PN}-${PATCH_V}-lam.patch + + # make sure the compile picks up the proper includes + sed -i \ + -e "s|INCLUDES.*=|INCLUDES = -I/usr/include/atlas/|" \ + "${S}"/CONFIG/src/SpewMakeInc.c \ + || die "failed to append proper includes" + + BLD_DIR="${S}"/gentoo-build + mkdir "${BLD_DIR}" || die "failed to generate build directory" + cd "${BLD_DIR}" + cp "${FILESDIR}"/war . && chmod a+x war || die "failed to install war" + + # force proper 32/64bit libs + local archselect + if use amd64 || use ppc64; then + archselect="-b 64" + elif use alpha; then + archselect="" + else + archselect="-b 32" + fi + + # Remove -m64 on alpha, since the compiler doesn't support it + use alpha && sed -i -e 's/-m64//g' "${S}"/CONFIG/src/probe_comp.c + + # unfortunately, atlas-3.9.0 chokes when passed + # x86_64-pc-linux-gnu-gcc and friends instead of + # plain gcc. Hence, we'll have to workaround this + # until it is fixed by upstream + local c_compiler=$(tc-getCC) + if [[ "${c_compiler}" == *gcc* ]]; then + c_compiler="gcc" + fi + + ../configure \ + --cc="${c_compiler}" \ + --cflags="${CFLAGS}" \ + --prefix="${D}/${DESTTREE}" \ + --libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \ + --incdir="${D}/${DESTTREE}"/include \ + -C ac "${c_compiler}" -F ac "${CFLAGS}" \ + -C if ${FORTRANC} -F if "${FFLAGS:-'-O2'}" \ + -Ss pmake "\$(MAKE) ${MAKEOPTS}" \ + -Si cputhrchk 0 ${archselect} \ + || die "configure failed" + + cd "${S_LAPACK}" + epatch "${WORKDIR}"/${L_PN}-reference-${L_PV}-autotools.patch + epatch "${FILESDIR}"/${L_PN}-reference-${L_PV}-test-fix.patch + eautoreconf + + # set up the testing routines + sed -e "s:g77:${FORTRANC}:" \ + -e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas cblas):" \ + -e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas cblas):" \ + -e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas cblas):" \ + -e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.so -Wl,-rpath,${S_LAPACK}/SRC/.libs:" \ + -e "s:EXT_ETIME$:INT_CPU_TIME:" \ + make.inc.example > make.inc \ + || die "Failed to set up make.inc" +} + +src_compile() { + # build atlas' part of lapack + cd "${BLD_DIR}" + for d in src/lapack interfaces/lapack/C/src interfaces/lapack/F77/src interfaces/lapack/C2F/src; do + cd "${BLD_DIR}"/${d} + make lib || die "Failed to make lib in ${d}" + done + + # build rest of lapack + S_LAPACK="${WORKDIR}"/${L_PN}-lite-${L_PV} + cd "${S_LAPACK}" + econf || die "Failed to configure reference lapack lib" + emake || die "Failed to make reference lapack lib" + + cd "${S_LAPACK}"/SRC + einfo "Copying liblapack.a/*.o to ${S_LAPACK}/SRC" + cp -sf "${BLD_DIR}"/gentoo/liblapack.a/*.o . + einfo "Copying liblapack.a/*.lo to ${S_LAPACK}/SRC" + cp -sf "${BLD_DIR}"/gentoo/liblapack.a/*.lo . + einfo "Copying liblapack.a/.libs/*.o to ${S_LAPACK}/SRC" + cp -sf "${BLD_DIR}"/gentoo/liblapack.a/.libs/*.o .libs/ + + RPATH="${DESTTREE}"/$(get_libdir)/${L_PN}/${MY_PN} + local flibs + [[ ${FORTRANC} == gfortran ]] && flibs=-lgfortran + [[ ${FORTRANC} == g77 ]] && flibs=-lg2c + ../libtool --mode=link --tag=F77 ${FORTRANC} ${LDFLAGS} \ + $(pkg-config --libs blas cblas) -latlas ${flibs} \ + -o liblapack.la *.lo -rpath "${RPATH}" \ + || die "Failed to create liblapack.la" + + # making pkg-config file + sed -e "s:@LIBDIR@:$(get_libdir)/lapack/atlas:" \ + -e "s:@PV@:${PV}:" \ + -e "s:@EXTLIBS@:-lm ${flibs}:g" \ + "${FILESDIR}"/lapack.pc.in > "${S}"/lapack.pc \ + || die "sed lapack.pc failed" +} + +src_install () { + dodir "${RPATH}" + + cd "${S_LAPACK}"/SRC + ../libtool --mode=install cp liblapack.la "${D}/${RPATH}" \ + || die "Failed to install lapack-atlas library" + + ESELECT_PROF=atlas + eselect lapack add $(get_libdir) "${FILESDIR}"/eselect.lapack.atlas ${ESELECT_PROF} + + insinto /usr/include/atlas + doins "${S}"/include/clapack.h || die "Failed to install clapack.h" + dosym atlas/clapack.h /usr/include/clapack.h + + cd "${S}" + dodoc README doc/AtlasCredits.txt doc/ChangeLog \ + || die "Failed to install docs" + + insinto /usr/$(get_libdir)/lapack/atlas + doins "${S}"/lapack.pc || die "Failed to install lapack.pc" +} + +src_test() { + cd "${S_LAPACK}"/TESTING/MATGEN + emake || die "Failed to create tmglib.a" + cd .. + emake || die "lapack-reference tests failed" +} + +pkg_postinst() { + local current_lib=$(eselect lapack show | cut -d' ' -f2) + # this snippet works around the eselect bug #189942 and makes + # sure that users upgrading from a previous lapack-atlas + # version pick up the new pkg-config files + if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then + local configfile="${ROOT}"/etc/env.d/lapack/$(get_libdir)/config + [[ -e ${configfile} ]] && rm -f ${configfile} + eselect lapack set ${ESELECT_PROF} + elog "lapack has been eselected to ${ESELECT_PROF}" + else + elog "Current eselected lapack is ${current_lib}" + elog "To use blas ${ESELECT_PROF} implementation, you have to issue (as root):" + elog "\t eselect lapack set ${ESELECT_PROF}" + fi +} |