aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-cluster/openmpi/ChangeLog78
-rw-r--r--sys-cluster/openmpi/Manifest5
-rw-r--r--sys-cluster/openmpi/openmpi-1.2.8.ebuild (renamed from sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild)23
3 files changed, 17 insertions, 89 deletions
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
deleted file mode 100644
index f8f777c65..000000000
--- a/sys-cluster/openmpi/ChangeLog
+++ /dev/null
@@ -1,78 +0,0 @@
-# ChangeLog for sys-cluster/openmpi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.13 2008/01/31 06:57:45 dberkholz Exp $
-
- 29 Feb 2008; Justin Bronder <jsbronder@gentoo.org> ChangeLog:
- Use mpi.eclass for empi support. Fix an as-needed bug.
-
- 31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
- -openmpi-1.1.1.ebuild, -openmpi-1.1.2.ebuild, -openmpi-1.2.4.ebuild,
- -openmpi-1.2.4-r1.ebuild:
- Clean up.
-
-*openmpi-1.2.5 (17 Jan 2008)
-
- 17 Jan 2008; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.2.5.ebuild:
- Version bump. Remove slurm USE flag as slurm isn't in the tree. Let
- configure find libtorque via pbs-config.
-
- 13 Dec 2007; Justin Bronder <jsbronder@gentoo.org> openmpi-1.2.4.ebuild:
- Minor fixes to sys-cluster/openmpi-1.2.4, thanks to dberkholz for pointing
- them out.
-
-*openmpi-1.2.4 (13 Dec 2007)
-
- 13 Dec 2007; Justin Bronder <jsbronder@gentoo.org> +openmpi-1.2.4.ebuild:
- Bump sys-cluster/openmpi-1.2.4 (Bug #166787). Change virtual/pbs to
- sys-cluster/torque. Add use flags nocxx romio slurm heterogeneous smp and
- ipv6. Disable xgrid support (OS X). Include /usr/include by default with
- gfortran and mpif77.
-
- 26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
- Update for cluster herd split to hp-cluster and ha-cluster.
-
- 06 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>; openmpi-1.1.2.ebuild:
- Fix miscalled use_enable(). This would result in Fortran not being enabled
- as expected (Aaron Tygart).
-
- 06 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; openmpi-1.1.1.ebuild,
- openmpi-1.1.2.ebuild:
- Stop PROVIDEing mpi virtual, we're on a new-style virtual now.
-
- 06 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; openmpi-1.1.1.ebuild,
- openmpi-1.1.2.ebuild:
- Can't do that with new-style virtuals, block on other providers instead.
-
- 06 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; openmpi-1.1.1.ebuild,
- openmpi-1.1.2.ebuild:
- Block virtual/mpi (Aaron Tygart).
-
- 06 Dec 2006; Donnie Berkholz <dberkholz@gentoo.org>; openmpi-1.1.1.ebuild,
- openmpi-1.1.2.ebuild:
- Explicitly set DEPEND to RDEPEND.
-
-*openmpi-1.1.2 (23 Nov 2006)
-
- 23 Nov 2006; Donnie Berkholz <dberkholz@gentoo.org>;
- +openmpi-1.1.2.ebuild:
- (#153968) Bump. Interesting changes include correctness and performance
- fixes for heterogenous nodes as well as TCP updates to support non-uniform
- TCP environments. More info at
- http://www.open-mpi.org/community/lists/announce/2006/10/0008.php.
-
- 25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; openmpi-1.1.1.ebuild:
- Add MPI to the description, drop some capital letters.
-
-*openmpi-1.1.1 (25 Sep 2006)
-
- 25 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml,
- +openmpi-1.1.1.ebuild:
- (#126295) Add Open MPI ebuild from the science overlay (Sebastien Fabbro,
- Eric Thibodeau). I removed the compiler-based slotting mechanism because
- portage lacks support for multiple slots of the same version -- the SLOT
- file in /var/db/pkg just gets overwritten and it loses track of the others,
- amongst other issues. Removed USE=static, that's used to compile static
- binaries, not to also build static libraries. Changed SLOT to 0 from 6 in
- the overlay. Removed the hack for PGI compilers, that needs to happen in
- fortran.eclass. Use epause() from eutils.eclass rather than sleep.
-
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 9f53a9249..ebc00f1e3 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,7 +1,6 @@
AUX eselect.mpi.openmpi 231 RMD160 a3f09385b6f2c4872398758f8195c156e07b3921 SHA1 660be0ad7d06a386173c714942bca32b01908aa9 SHA256 363bd1efd2bf2593ee34145cc9e6f0c9705c204368c380d07088ba0d041b446d
-DIST openmpi-1.2.6.tar.bz2 3556676 RMD160 abb72266e44cb5e3a2450a4936f3744edef77cf4 SHA1 b2960e2fd7432816cb70302a6b6c2f55fbd62cab SHA256 e5b27af5a153a257b1562a97bbf7164629161033934558cefd8e1e644a9f73d3
DIST openmpi-1.2.7.tar.bz2 3555597 RMD160 6707fba2f2de240c25f6135cd37bb42eb78c6590 SHA1 fd377ff52c5b6f61c293b0daa9d681046e673e22 SHA256 d66c7f0bb11494023451651d0e61afaef9d2199ed9a91ed08f0dedeb51541c36
-EBUILD openmpi-1.2.6-r2.ebuild 2674 RMD160 6a84e61ac4291e62bc1fb5db4c6e24e218150507 SHA1 95e06d19adfaa871b09b54c80787302da5fd24b8 SHA256 169d84d00b4468a5e063b4a9cc601ed60af5c53c596e20676927a41a30fc371f
+DIST openmpi-1.2.8.tar.bz2 3556787 RMD160 59f0d0397d499eb7b3a08ca68ca9778ef2cb61fc SHA1 140ae223263e20b7bde8ac59b966924ba4a454bb SHA256 75b286cb3b1bf6528a7e64ee019369e0601b8acb5c3c167a987f755d1e41c95c
EBUILD openmpi-1.2.7-r2.ebuild 2952 RMD160 90a10f049aa7e4fe93d78ccf9823313e2c4cf76a SHA1 150e74cabe57285afa9c453d3ae8fb44d278f5ae SHA256 36f2979ebfa3d0aeebdcf7feb79fcbc415a8dcade47d9f8881874abfb6bcb6d5
-MISC ChangeLog 3407 RMD160 22e4c4a7a1d5438ec4990c8a452ddbed01068c29 SHA1 47f21280d9b5dc2c0419f0a670ecc9e7eaf412a0 SHA256 46c753e31a0119ef4e69798347d7a0178f36b6912405c8be4bfdfa7344f4e63c
+EBUILD openmpi-1.2.8.ebuild 2952 RMD160 90a10f049aa7e4fe93d78ccf9823313e2c4cf76a SHA1 150e74cabe57285afa9c453d3ae8fb44d278f5ae SHA256 36f2979ebfa3d0aeebdcf7feb79fcbc415a8dcade47d9f8881874abfb6bcb6d5
MISC metadata.xml 714 RMD160 3a1b1cfafed8b2a9f674bbf03613a176a3c33894 SHA1 99ad99472912c4dd79eb9b1efd2439ff57f0becc SHA256 5139ae14e69e5edca9117ec6f4bb4f5c7654f41ef5050d5d777d47f0b1d05236
diff --git a/sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild b/sys-cluster/openmpi/openmpi-1.2.8.ebuild
index 8730be405..cdf4d9697 100644
--- a/sys-cluster/openmpi/openmpi-1.2.6-r2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.2.8.ebuild
@@ -13,7 +13,8 @@ SRC_URI="http://www.open-mpi.org/software/ompi/v1.2/downloads/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="pbs fortran nocxx threads romio heterogeneous ipv6"
+RESTRICT="mpi-threads? ( test )"
+IUSE="fortran heterogeneous ipv6 mpi-threads nocxx pbs romio threads"
RDEPEND="pbs? ( sys-cluster/torque )
$(mpi_imp_deplist)"
DEPEND="${RDEPEND}"
@@ -21,11 +22,11 @@ DEPEND="${RDEPEND}"
pkg_setup() {
MPI_ESELECT_FILE="eselect.mpi.openmpi"
mpi_pkg_setup
- if use threads; then
+ if use mpi-threads; then
ewarn
- ewarn "WARNING: use of threads is still disabled by default in"
- ewarn "upstream builds."
- ewarn "You may stop now and set USE=-threads"
+ ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
+ ewarn "default and officially unsupported by upstream."
+ ewarn "You may stop now and set USE=-mpi-threads"
ewarn
epause 5
fi
@@ -49,6 +50,13 @@ src_unpack() {
# Fix --as-needed problems with f77 and f90.
sed -i 's:^libs=:libs=-Wl,--no-as-needed :' \
ompi/tools/wrappers/mpif{77,90}-wrapper-data.txt.in
+
+ # Necessary for scalibility, see
+ # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+ if use threads; then
+ echo 'oob_tcp_listen_mode = listen_thread' \
+ >> opal/etc/openmpi-mca-params.conf
+ fi
}
src_compile() {
@@ -58,11 +66,10 @@ src_compile() {
--enable-orterun-prefix-by-default
--without-slurm"
- if use threads; then
+ if use mpi-threads; then
mpi_conf_args="${mpi_conf_args}
--enable-mpi-threads
- --with-progress-threads
- --with-threads=posix"
+ --with-progress-threads"
fi
if use fortran; then