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

(Portage version: 2.1.5.2)

4 files changed, 26 insertions, 219 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/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)