Added upstream fix for complex GEMM bug (issue 1970660 in atlas' bug tracker). Removed old version.

Package-Manager: portage-2.1.5.2

5 files changed, 29 insertions, 233 deletions

diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog
index f585275ef878..87cc58f3bf1a 100644
--- a/sci-libs/blas-atlas/ChangeLog
+++ b/sci-libs/blas-atlas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/blas-atlas
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.76 2008/02/23 11:10:57 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.77 2008/05/24 17:39:38 markusle Exp $
+
+  24 May 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/blas-atlas-3.8.1-gemm-fix.patch, -blas-atlas-3.7.39.ebuild,
+  blas-atlas-3.8.1.ebuild:
+  Added upstream fix for complex GEMM bug (issue 1970660 in atlas' bug
+  tracker). Removed old version.
 
 *blas-atlas-3.8.1 (22 Feb 2008)
 
diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest
index 93dc7901ca27..b9babe8cf373 100644
--- a/sci-libs/blas-atlas/Manifest
+++ b/sci-libs/blas-atlas/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.6.0-ppc-configure.patch 448 RMD160 10f1ed25bb5b40be81b80a7b213f609f5290a676 SHA1 be876d4fdd1db8d2c4abbefaa665723867add1e3 SHA256 a61820e4434f28703f15c1e5a9a8f0f3b52b91cd8680835ea14490d991b79dc7
 AUX 3.7.11-allow-any-gcc-version.patch 841 RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa SHA1 da0157ab5932188865ae5573eb40c2548abdd71a SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87
 AUX 3.7.11-ppc-configure.patch 467 RMD160 677632d42ad38c49aec1584fab8f4f5609b55f51 SHA1 2a13f7883089a0db244b92c98301819716f8ebaa SHA256 6172bd66891a260d8d4b84f461001bf20459fdef30a5be730f39348068bede94
 AUX atlas-3.7.39-decl-fix.patch 2791 RMD160 b84743fb2f255719197f7481c8826e7b2360044f SHA1 80008056fcafdbefb9e3538ef962c93d5a0df1ca SHA256 d5a8c69c2e196e946c61003b6bf3088b05a6b13b428efa8be8ef7eb54bdf3670
 AUX atlas-asm-gentoo.patch 408 RMD160 3cea2f4a5a96ec22a4d0cfc78d691198a2d1a0da SHA1 493d066be68c66cca1f0c906d588da8983ec7afa SHA256 00f9247d422c758ef8ff43446a36a6dbb7962f94e5d01307318c87a90a78355b
+AUX blas-atlas-3.8.1-gemm-fix.patch 632 RMD160 bbc3e9db1d8b8e7199d65ecc04ca98ce73694d42 SHA1 43d4c86a065a8da760a8ff06bf9b969043329b96 SHA256 50a6fce8c3e712130c3de9cb97f796862ff6df72f2659232c3e0bf871c2fe49d
 AUX blas.pc.in 301 RMD160 e82627c38aa09c8eb2581a4dd8a38c1670ed6098 SHA1 e8c80353ba72bee2848767b70f7575b723b84f15 SHA256 cb993e61b03514c4c69fac43540e45e759cf57635e2a8d6900118543d06ff433
 AUX c-ATLAS 497 RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 SHA1 8dc57e828646aaa1d2de089a187c7b69973bd9b4 SHA256 4d135a53bf4bce2a373f2154286876bbba5a78ccab48834e3db3a83714f224c8
 AUX c-threaded-ATLAS 563 RMD160 410a2f15c4d0c210df778ef53cd15c2400b6a3d7 SHA1 b1e8b5cc85173cd2f5131836897f8b91b2b19e40 SHA256 d3334c1f222589c0ca7794576819b0d9c791d3c37ffac61a2270cb06aa3a8229
@@ -28,22 +26,13 @@ DIST atlas3.6.0-shared-libs.1.patch.bz2 5148 RMD160 96f9357049fb22e0955ff1375630
 DIST atlas3.6.0-shared-libs.3.patch.bz2 5140 RMD160 d6085b2729f2b8ed917b1d0a85339bd07f4192f9 SHA1 a9f234416bdbc1a752196f48707a066687fdfeb2 SHA256 9cd442b35c869c90b569154bf82a8f18c92fb5e0221c26c7cff23b0a7e9e2cd8
 DIST atlas3.6.0.tar.bz2 1687723 RMD160 e7d40a6677ce7c4442df7152150aecf812020713 SHA1 61dd7ace2f43e9a10864148a71fa443a6eae2c3d SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8
 DIST atlas3.7.11.tar.bz2 2032724 RMD160 f58b8a85c097bd1bff6a53ee42bcff97240fb8ec SHA1 7806c43147535f6422bdaacb4416aa06a5de0f07 SHA256 558b9f3f0dc8f63306f99f75d6e6fa762ea3d9d0dea88053e3e8b6f0e6364109
-DIST atlas3.7.39.tar.bz2 2464374 RMD160 286b71b0f35f3f78d06855d669b1a10f838abf30 SHA1 6df7f1841f502b5a35c633b6f9c11425737e068d SHA256 e7529a6ddae7b59063caaa90d7e617c4192fdd6e24c45ed1991ed80debc0e56b
 DIST atlas3.8.0.tar.bz2 2463051 RMD160 16d52414c72f6a738823e0e93fdcd7dae8477bee SHA1 12924091d58eb8e5a9fcf7cfbc6b44ba2d397619 SHA256 e9131d8ffd2dfdd12312676e38183ca45a52547fad5498e46f90c95954bf121c
 DIST atlas3.8.1.tar.bz2 2505223 RMD160 8bec47d46c09b6c0693806b95fb74ce2e5bd1225 SHA1 67c776afa6b16bfe69dd610ea6baeb21738943eb SHA256 501fc4b1e06843576a3e911f9c353bac1f26903c35e472f4dc67ecd60059e304
 EBUILD blas-atlas-3.6.0-r1.ebuild 4547 RMD160 e680a4491ce01fd2e207eec07ab0ab612ce0ad69 SHA1 792fcdd9d2c2ed57c8c069b3d267aec3ec262ae2 SHA256 751f733e699dad68e0f6b6cbb3dcdac8c3d3aa443d3633b4ba0b97a771a468f0
 EBUILD blas-atlas-3.6.0-r2.ebuild 5012 RMD160 0daf679b711b18503ac70006a6f7210d89a44341 SHA1 e92f6fbbc957223ac11a422022e9d23e065f94c1 SHA256 cf580987c02fe317499d6459185d5a397b6738543678051b08d3fc976ff6d128
 EBUILD blas-atlas-3.7.11-r1.ebuild 5680 RMD160 66aea21ca1e39e2286f037a6f3471fa8d5232ea4 SHA1 22f6f2d9a5a26a86da185dd2c8be03d17f64449d SHA256 985af8fb77ab73ed6d1037a37a90ea063ffbab1ddd3b2e07ffc90366af389038
 EBUILD blas-atlas-3.7.11.ebuild 5048 RMD160 c286cdd38ee471c6243495f78df23df1e835d1f0 SHA1 b45489f4818aa09fd63d355bc3ae18dd6fce3938 SHA256 460202e681da98b1d76fb2a64abbc6a4771e6e05d60ec4fdabb83bbea8643422
-EBUILD blas-atlas-3.7.39.ebuild 6602 RMD160 c8755dc64f78190576faaf5bffac6b3a532aab53 SHA1 9405f3a2e34fc1f776e629ad23c31a213fdd0d37 SHA256 0e4641485bdf330d9fa87cd8736c5048ea5edcc1fe5857ac9ccfdcd9cc072003
 EBUILD blas-atlas-3.8.0.ebuild 6843 RMD160 1e105707051e2653aa7bd941f1f1192acda207f7 SHA1 ab4c92fdb97a9a46946948c0ca6287c8ad27a014 SHA256 fcabb010ad4c78711dd6ebaa932be315071ce465657106ee4cc122e14977672e
-EBUILD blas-atlas-3.8.1.ebuild 6682 RMD160 87069b1e94b0505d8a6165400f568c8c1b5f0891 SHA1 f233849852fe55d966af74e86b86a640513bd6ea SHA256 faa27a7aff12d74ea8bb3798f88303e14e3fd550bbfbf8b050549ab2cb328581
-MISC ChangeLog 15821 RMD160 3e900e6dd8a7d10398f153c67112edff432668dc SHA1 710a39302655674d6d6b23618e884d5c3658b3a6 SHA256 6466dfd87a6acf888d5a4fe34b646dfda4a56866f6abc484adc7cd8c231da88a
+EBUILD blas-atlas-3.8.1.ebuild 6724 RMD160 7cff27d5dbc900734c90ed7f3ffcdb79de825818 SHA1 f3d1796577f8353242c94d6824229b1bfa746e53 SHA256 ef8c79452d051b3f661216b30a6498540a5fadf8c30e321fd7aeb99089176249
+MISC ChangeLog 16075 RMD160 48d2778518daa7ed972b1b15ff3e45070e050551 SHA1 2dc0947a15b2596d10681def33fcaf2526535190 SHA256 7480e9bf62a5e760d22ed0b32a1e80f51bf68053b23f12c9006411070024e18a
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFIDZ8t1ycZbhPLE2ARAjZDAJ9YInyRiCZ0Q1UxWkboi1oihvWv7QCfaTxe
-0Y0ORT2tgoST1pyjwAjfe4k=
-=pOva
------END PGP SIGNATURE-----
diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild
deleted file mode 100644
index e0efa3a19f1f..000000000000
--- a/sci-libs/blas-atlas/blas-atlas-3.7.39.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2007 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.7.39.ebuild,v 1.3 2008/04/22 08:17:39 bicatali 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-/}
-SRC_URI="mirror://sourceforge/math-atlas/${MY_PN}${PV}.tar.bz2
-	mirror://gentoo/${MY_PN}-${PV}-shared-libs.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.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
-	epause 10
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${DISTDIR}"/${MY_PN}-${PV}-shared-libs.patch.bz2
-	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
-	epatch "${FILESDIR}"/${MY_PN}-${PV}-decl-fix.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
-
-	../configure \
-		--cc="$(tc-getCC)" \
-		--cflags="${CFLAGS}" \
-		--prefix="${D}/${DESTTREE}" \
-		--libdir="${D}/${DESTTREE}"/$(get_libdir)/atlas \
-		--incdir="${D}/${DESTTREE}"/include \
-		-C ac "$(tc-getCC)" -F ac "${CFLAGS}" \
-		-C if ${FORTRANC} -F if "${FFLAGS:--O2}" \
-		-Ss pmake "\$(MAKE) ${MAKEOPTS}" \
-		-Si cputhrchk 0 ${archselect} \
-		|| die "configure failed"
-}
-
-src_compile() {
-	cd "${BLD_DIR}"
-
-	# atlas does its own parallel builds
-	emake -j1 || die "emake failed"
-
-	RPATH="${DESTTREE}"/$(get_libdir)/blas
-	make \
-		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
-		make \
-			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):" \
-		-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):" \
-			-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=threaded-atlas
-
-		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 \
-		|| 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} || -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/blas-atlas-3.8.1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.8.1.ebuild
index bfff861e2aba..8eb5dd1434dd 100644
--- a/sci-libs/blas-atlas/blas-atlas-3.8.1.ebuild
+++ b/sci-libs/blas-atlas/blas-atlas-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.8.1.ebuild,v 1.4 2008/04/21 15:59:34 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.8.1.ebuild,v 1.5 2008/05/24 17:39:38 markusle Exp $
 
 inherit eutils toolchain-funcs fortran multilib
 
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch "${DISTDIR}"/${MY_PN}-${PATCH_V}-shared-libs.patch.bz2
 	epatch "${FILESDIR}"/${MY_PN}-asm-gentoo.patch
 	epatch "${FILESDIR}"/${MY_PN}-${PATCH_V}-decl-fix.patch
+	epatch "${FILESDIR}"/${P}-gemm-fix.patch
 
 	BLD_DIR="${S}"/gentoo-build
 	mkdir "${BLD_DIR}" || die "failed to generate build directory"
diff --git a/sci-libs/blas-atlas/files/blas-atlas-3.8.1-gemm-fix.patch b/sci-libs/blas-atlas/files/blas-atlas-3.8.1-gemm-fix.patch
new file mode 100644
index 000000000000..9409f90c8a07
--- /dev/null
+++ b/sci-libs/blas-atlas/files/blas-atlas-3.8.1-gemm-fix.patch
@@ -0,0 +1,17 @@
+diff -Naur ATLAS/src/blas/gemm/ATL_cmmJITcp.c ATLAS.new/src/blas/gemm/ATL_cmmJITcp.c
+--- ATLAS/src/blas/gemm/ATL_cmmJITcp.c	2008-02-22 11:38:58.000000000 -0500
++++ ATLAS.new/src/blas/gemm/ATL_cmmJITcp.c	2008-05-23 18:07:34.000000000 -0400
+@@ -264,8 +264,11 @@
+       NBmm1 = Mjoin(PATLU,pMBmm_b1);
+       NBmmX = Mjoin(PATLU,pMBmm_bX);
+    }
+-   else  /* two or more dim < NB, requires generated cleanup */
+-      NBmm0 = NBmm1 = NBmmX = Mjoin(PATLU,pKBmm);
++   else 
++   { 
++     NBmm0 = NBmm1 = NBmmX = Mjoin(PATLU,pKBmm);
++     if (SCALAR_IS_ZERO(beta)) Mjoin(PATL,gezero)(M, N, C, ldc); 
++   }
+    if (nblk)
+    {
+       if (B)