added openib-mvapich2-1.0.1-r1.ebuild, added ~x86 keyword

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@1100 32389bae-6d03-0410-99cf-db05cde120eb

8 files changed, 183 insertions, 11 deletions

diff --git a/sys-cluster/openib-mvapich2/ChangeLog b/sys-cluster/openib-mvapich2/ChangeLog
index 8677663c2..3572e013f 100644
--- a/sys-cluster/openib-mvapich2/ChangeLog
+++ b/sys-cluster/openib-mvapich2/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for sys-cluster/openib-mvapich2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openib-mvapich2-1.0.1-r1 (28 May 2008)
+  28 May 2008; Bryan Green <bryan.d.green@nasa.gov> ChangeLog:
+  added 1.0.1-r1 per Bug 219368
+  fixed copyright dates
+  +openib-mvapich2-1.0.1-r1.ebuild: added
+  +files/eselect.mpi.mvapich2: added
+
 *openib-mvapich2-1.0.1 (26 Nov 2007)
 *openib-mvapich2-1.0 (26 Nov 2007)
 
diff --git a/sys-cluster/openib-mvapich2/Manifest b/sys-cluster/openib-mvapich2/Manifest
index 68915f562..e34e8dc59 100644
--- a/sys-cluster/openib-mvapich2/Manifest
+++ b/sys-cluster/openib-mvapich2/Manifest
@@ -1,10 +1,12 @@
+AUX eselect.mpi.mvapich2 231 RMD160 a3f09385b6f2c4872398758f8195c156e07b3921 SHA1 660be0ad7d06a386173c714942bca32b01908aa9 SHA256 363bd1efd2bf2593ee34145cc9e6f0c9705c204368c380d07088ba0d041b446d
 DIST mvapich2-0.9.5.tar.gz 13873 RMD160 56e146c80be3cd7b5f1e1469f20e2c17549b15d7 SHA1 4026f5d3b32fc279a1480842599f0dd1a04b4621 SHA256 1dcd75956f8d947c5cbdeed39d7d39440d9cb0132aa3607042452514ca922d8f
 DIST mvapich2-0.9.6.tar.gz 13873 RMD160 56e146c80be3cd7b5f1e1469f20e2c17549b15d7 SHA1 4026f5d3b32fc279a1480842599f0dd1a04b4621 SHA256 1dcd75956f8d947c5cbdeed39d7d39440d9cb0132aa3607042452514ca922d8f
 DIST mvapich2-1.0.1.tar.gz 14062480 RMD160 da9e4dd07998d82ead0276e8b264a487c4d4fe79 SHA1 3edc9720251f8060e0f9c8cc58800a45a66cc7ae SHA256 a20fb87ed674bec3b2de87c47cc3965c33248e00b37f7eb08ba40d0bab07ca5e
 DIST mvapich2-1.0.tar.gz 14061056 RMD160 ba57d0d51bbdd3956dce446575d2ecbed4fe5b2f SHA1 b2f6ecf3e3b06c63b443bbcc55c2043f6d683f67 SHA256 30c0849dc7e8d4581cfee16a824f5e384e8198b60b7f54f880f4e25da7d1c143
-EBUILD openib-mvapich2-0.9.5.ebuild 3222 RMD160 e0b6bc33447310ae3a399ec1b4c863608b0e2d56 SHA1 23177acf2877974819632521e268b032af23d5be SHA256 6824f36f6017c2b25180b60255f00ae217249bf053f64d5d762f5432d8db62ee
-EBUILD openib-mvapich2-0.9.6.ebuild 3222 RMD160 f0ebda625161eb96f3b10273fdaa79db32b96f80 SHA1 3b6c16795f0c11be899a53c65df7d59e67d473d3 SHA256 9631de54a42fb009d5d7deb31a3b0e942da6a8bb2d52239d07291ab49e55387b
-EBUILD openib-mvapich2-1.0.1.ebuild 3124 RMD160 a7ac3beae7fbb6e5b8b188eb597ccf80e937b3a1 SHA1 dc1f83357d0d8e151a51897ce666972db6e9bf3a SHA256 831c25b8e13607b6171fd09b7705eb92aef30209c34107337fb49046891fa902
-EBUILD openib-mvapich2-1.0.ebuild 3124 RMD160 a7ac3beae7fbb6e5b8b188eb597ccf80e937b3a1 SHA1 dc1f83357d0d8e151a51897ce666972db6e9bf3a SHA256 831c25b8e13607b6171fd09b7705eb92aef30209c34107337fb49046891fa902
-MISC ChangeLog 482 RMD160 510c7ea0092869a20c5a0b4b331bee81eff6fc58 SHA1 7359ad77ba4cc10fba307d22212fded8736950dc SHA256 7eba1c1d9c260c8c7b2477e13aff03e1cc6d266aab5ab0e3c1b2ce34d6aa4ed4
+EBUILD openib-mvapich2-0.9.5.ebuild 3227 RMD160 9d0d68e5fa9ff475294aa991094517478f0090ae SHA1 694729bfd02639f65e376187c6366731334c7142 SHA256 1e655c043996f86232e5ac1dab156d21c3fca4c4be3e202bcbb8f75d7b345b74
+EBUILD openib-mvapich2-0.9.6.ebuild 3222 RMD160 722c4dbea3358ebb2810fd47f68433744bf70d59 SHA1 af556fe75370c979e6600c13d3354ffabf3cf027 SHA256 5dae03b9523bf5b72c859f34d41edd53a090ed09faaa00069dae581349a4b9d7
+EBUILD openib-mvapich2-1.0.1-r1.ebuild 4200 RMD160 617e5fc110dc0c0d7105d91c1bf09d5ffccb2f7d SHA1 d75122849a24f5b55cae0338ed59f7a4563ab48d SHA256 a88521def78b43b2f6c16461147149b2dc6adeebade2f5ec15625f9a4b04d6fb
+EBUILD openib-mvapich2-1.0.1.ebuild 3124 RMD160 b5e931451462a275363ff3fe8764f5684deb0c6e SHA1 31f291fd15dd9651442af630be4a7418936ed9f6 SHA256 5748e92e739081c485b98c41b729234ba3bf1aa010fdf4dad6aae99d7732e7ee
+EBUILD openib-mvapich2-1.0.ebuild 3124 RMD160 b5e931451462a275363ff3fe8764f5684deb0c6e SHA1 31f291fd15dd9651442af630be4a7418936ed9f6 SHA256 5748e92e739081c485b98c41b729234ba3bf1aa010fdf4dad6aae99d7732e7ee
+MISC ChangeLog 721 RMD160 663dba52f421ca918e0d00b9eebfc0c580917346 SHA1 c79a5b5b1c96bf9ffff0efceeeb602012ee79d75 SHA256 fcb6e0920aa996bf56dd54b24eefed4511ed16e421920fa09788d79af7a09028
 MISC metadata.xml 262 RMD160 2e8cfe97bd1a25814de0657adb7f9ab7f2861895 SHA1 e8a4f573ce01738445befdd0a3e597a79385c0cb SHA256 c54bb4a2708874d3875753c62b071b05f08f6947f71767ac26a4063ad3e4871a
diff --git a/sys-cluster/openib-mvapich2/files/eselect.mpi.mvapich2 b/sys-cluster/openib-mvapich2/files/eselect.mpi.mvapich2
new file mode 100644
index 000000000..d1d2131a1
--- /dev/null
+++ b/sys-cluster/openib-mvapich2/files/eselect.mpi.mvapich2
@@ -0,0 +1,8 @@
+MPI_CC=@ROOT@/usr/bin/mpicc
+MPI_CXX=@ROOT@/usr/bin/mpic++
+MPI_F77=@ROOT@/usr/bin/mpif77
+MPI_F90=@ROOT@/usr/bin/mpif90
+MPI_BUILT_WITH=@BUILT_WITH@
+PATH=@ROOT@/usr/bin
+MANPATH=@ROOT@/usr/share/man
+LD_LIBRARY_PATH=@ROOT@/usr/@LIBDIR@
diff --git a/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.5.ebuild b/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.5.ebuild
index 185418af5..09be925a2 100644
--- a/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.5.ebuild
+++ b/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,7 +9,7 @@
 SLOT="0"
 LICENSE="BSD"
 
-KEYWORDS="~amd64"
+KEYWORDS="~x86 ~amd64"
 
 DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB."
 
diff --git a/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.6.ebuild b/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.6.ebuild
index 292f6e9ec..eb38433cd 100644
--- a/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.6.ebuild
+++ b/sys-cluster/openib-mvapich2/openib-mvapich2-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild b/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild
new file mode 100644
index 000000000..297f30864
--- /dev/null
+++ b/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit mpi fortran
+
+SLOT="0"
+LICENSE="BSD"
+
+KEYWORDS="~x86 ~amd64"
+
+DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB."
+
+HOMEPAGE="http://mvapich.cse.ohio-state.edu/"
+SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tar.gz"
+
+S="${WORKDIR}/mvapich2-${PV/_/-}"
+
+IUSE="debug medium-cluster large-cluster rdma romio threads fortran"
+
+RDEPEND="
+	|| ( ( sys-cluster/libibverbs
+			sys-cluster/libibumad
+			sys-cluster/libibmad
+			rdma? ( sys-cluster/librdmacm ) )
+			sys-cluster/openib-userspace )
+	$(mpi_imp_deplist)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	MPI_ESELECT_FILE="eselect.mpi.mvapich2"
+
+	if [ -z "${MVAPICH_HCA_TYPE}" ]; then
+		elog "${PN} needs to know which HCA it should optimize for.  This is"
+		elog "passed to the ebuild with the variable, \${MVAPICH_HCA_TYPE}."
+		elog "Please choose one of:  _MLX_PCI_EX_SDR_, _MLX_PCI_EX_DDR_,"
+		elog "_MLX_PCI_X, _PATH_HT_, or _IBM_EHCA_."
+		elog "See make.mvapich2.detect in ${S} for more information."
+		die "MVAPICH_HCA_TYPE undefined"
+	fi
+
+	case ${ARCH} in
+		amd64)
+			if grep Intel /proc/cpuinfo &>/dev/null; then
+				BUILD_ARCH=-D_EM64T_
+			else
+				BUILD_ARCH=-D_X86_64_
+			fi
+			;;
+		x86)
+			BUILD_ARCH=-D_IA32_
+			;;
+		ia64)
+			BUILD_ARCH=-D_IA64_
+			;;
+		ppc64)
+			BUILD_ARCH=-D_PPC64_
+			;;
+		*)
+			die "unsupported architecture: ${ARCH}"
+			;;
+	esac
+	mpi_pkg_setup
+	use fortran && fortran_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Examples are always compiled with the default 'all' target.  This
+	# causes problems when we don't build support for everything, including
+	# threads, mpe2, etc.  So we're not going to build them.
+	sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in
+}
+
+src_compile() {
+	mpi_conf_args="
+		--with-device=osu_ch3:mrail
+		--with-rdma=gen2
+		--with-pm=mpd
+		$(use_enable romio)
+		--with-mpe=no"
+
+	# TODO Shared libs should build with this, but they don't
+	# --enable-shared=gcc"
+
+	local enable_srq
+	local vcluster=-D_SMALL_CLUSTER
+
+	use large-cluster 	&& vcluster=-D_LARGE_CLUSTER
+	use medium-cluster 	&& vcluster=-D_MEDIUM_CLUSTER
+	[ "${MVAPICH_HCA_TYPE}" == "_MLX_PCI_X_" ] && enable_srq="-DSRQ"
+
+	if use rdma; then
+		append-ldflags "-lrdmacm"
+		append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
+	fi
+	append-ldflags "-libverbs -libumad -libmad"
+
+	append-flags "${BUILD_ARCH} -DUSE_INLINE -D_SMP_ -D_GNU_SOURCE"
+	append-flags "${enable_srq} -DUSE_HEADER_CACHING -DLAZY_MEM_UNREGISTER"
+	append-flags "-DONE_SIDED -D${MVAPICH_HCA_TYPE} ${vcluster}"
+	append-flags "-DMPID_USE_SEQUENCE_NUMBERS -DUSE_MPD_RING"
+
+	use debug && mpi_conf_args="${mpi_conf_args} --enable-g=all --enable-debuginfo"
+
+	if use threads; then
+		mpi_conf_args="${mpi_conf_args} --enable-threads=multiple --with-thread-package=pthreads"
+		append-flags "-pthread"
+	else
+		mpi_conf_args="${mpi_conf_args} --with-thread-package=none"
+	fi
+
+	# enable f90 support for appropriate compilers
+	if use fortran; then
+		case "${FORTRANC}" in
+			gfortran|ifc|ifort|f95)
+				mpi_conf_args="${mpi_conf_args} --enable-f77 --enable-f90";;
+			g77|f77|f2c)
+				mpi_conf_args="${mpi_conf_args} --enable-f77 --disable-f90";;
+		esac
+	else
+		mpi_conf_args="--disable-f77 --disable-f90"
+	fi
+
+	mpi_make_args="-j1"
+
+	sed -i \
+		-e 's/ ${exec_prefix}/ ${DESTDIR}${exec_prefix}/' \
+		-e 's/ ${libdir}/ ${DESTDIR}${libdir}/' \
+		${S/-beta2/}/Makefile.in
+	sed -i '/bindir/s/ ${bindir}/ ${DESTDIR}${bindir}/' ${S/-beta2/}/src/pm/mpd/Makefile.in
+	cd ${S/-beta2/}
+
+	mpi_src_compile
+}
+
+src_install() {
+	mpi_src_install
+	mpi_dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \
+		README* RELEASE_NOTES*
+}
+
+pkg_postinst() {
+	einfo "To allow normal users to use infiniband, it is necessary to"
+	einfo "increase the system limits on locked memory."
+	einfo "You must increase the kernel.shmmax sysctl value, and increase"
+	einfo "the memlock limits in /etc/security/limits.conf.  i.e.:"
+	echo
+	einfo "echo 'kernel.shmmax = 512000000' >> /etc/sysctl.conf"
+	einfo "echo 512000000 > /proc/sys/kernel/shmmax"
+	einfo "echo -e '* soft memlock 500000\n* hard memlock 500000' > /etc/security/limits.conf"
+}
+
diff --git a/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1.ebuild b/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1.ebuild
index 73ad86918..05d00a8f7 100644
--- a/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1.ebuild
+++ b/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
diff --git a/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.ebuild b/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.ebuild
index 73ad86918..05d00a8f7 100644
--- a/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.ebuild
+++ b/sys-cluster/openib-mvapich2/openib-mvapich2-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $