Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mvapich2/
Date: Thu, 30 Jun 2011 23:30:21
Message-Id: b531b0297de30ee4610e2372c52da2cacada49cc.alexxy@gentoo
1 commit: b531b0297de30ee4610e2372c52da2cacada49cc
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 23:09:16 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 23:28:57 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b531b029
7
8 [sys-cluster/mvapich2] Update to eapi4
9
10 (Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key F82F92E6)
11
12 ---
13 sys-cluster/mvapich2/metadata.xml | 1 -
14 ...{mvapich2-1.6.ebuild => mvapich2-1.6-r1.ebuild} | 23 +++++++-------------
15 2 files changed, 8 insertions(+), 16 deletions(-)
16
17 diff --git a/sys-cluster/mvapich2/metadata.xml b/sys-cluster/mvapich2/metadata.xml
18 index a5a0043..90e0091 100644
19 --- a/sys-cluster/mvapich2/metadata.xml
20 +++ b/sys-cluster/mvapich2/metadata.xml
21 @@ -8,7 +8,6 @@ MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB.
22 <use>
23 <flag name="large-cluster">Automatically generated description for large-cluster</flag>
24 <flag name="medium-cluster">Automatically generated description for medium-cluster</flag>
25 - <flag name="rdma">Automatically generated description for rdma</flag>
26 <flag name="romio">Automatically generated description for romio</flag>
27 </use>
28 </pkgmetadata>
29
30 diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
31 similarity index 90%
32 rename from sys-cluster/mvapich2/mvapich2-1.6.ebuild
33 rename to sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
34 index b9c7ed4..6241835 100644
35 --- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild
36 +++ b/sys-cluster/mvapich2/mvapich2-1.6-r1.ebuild
37 @@ -2,6 +2,8 @@
38 # Distributed under the terms of the GNU General Public License v2
39 # $Header: $
40
41 +EAPI="4"
42 +
43 inherit fortran-2 mpi
44
45 DESCRIPTION="MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB"
46 @@ -11,7 +13,7 @@ SRC_URI="${HOMEPAGE}/download/mvapich2/mvapich2-${PV/_/-}.tgz"
47 SLOT="0"
48 LICENSE="BSD"
49 KEYWORDS="~x86 ~amd64"
50 -IUSE="debug fortran large-cluster medium-cluster rdma romio threads"
51 +IUSE="debug fortran large-cluster medium-cluster romio threads"
52
53 RDEPEND="
54 || (
55 @@ -19,7 +21,7 @@ RDEPEND="
56 sys-infiniband/libibverbs
57 sys-infiniband/libibumad
58 sys-infiniband/libibmad
59 - rdma? ( sys-infiniband/librdmacm ) )
60 + sys-infiniband/librdmacm )
61 sys-infiniband/openib-userspace )"
62 DEPEND="${RDEPEND}"
63
64 @@ -61,9 +63,7 @@ pkg_setup() {
65 esac
66 }
67
68 -src_unpack() {
69 - unpack ${A}
70 - cd "${S}"
71 +src_prepare() {
72 einfo "Disabling examples"
73 # Examples are always compiled with the default 'all' target. This
74 # causes problems when we don't build support for everything, including
75 @@ -71,7 +71,7 @@ src_unpack() {
76 sed -i 's:.*cd examples && ${MAKE} all.*::' Makefile.in
77 }
78
79 -src_compile() {
80 +src_configure() {
81 local c="--with-device=osu_ch3:mrail
82 --with-rdma=gen2
83 --with-pm=mpd
84 @@ -88,10 +88,8 @@ src_compile() {
85 use medium-cluster && vcluster=-D_MEDIUM_CLUSTER
86 [ "${MVAPICH_HCA_TYPE}" == "_MLX_PCI_X_" ] && enable_srq="-DSRQ"
87
88 - if use rdma; then
89 - append-ldflags "-lrdmacm"
90 - append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
91 - fi
92 + append-ldflags "-lrdmacm"
93 + append-flags "-DADAPTIVE_RDMA_FAST_PATH -DRDMA_CM"
94 append-ldflags "-libverbs -libumad -libmad"
95
96 append-flags "${BUILD_ARCH} -DUSE_INLINE -D_SMP_ -D_GNU_SOURCE"
97 @@ -129,11 +127,6 @@ src_compile() {
98
99 ! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
100 econf $(mpi_econf_args) ${c}
101 -
102 - # http://www.mcs.anl.gov/research/projects/mpich2/support/index.php?s=faqs#parmake
103 - # https://trac.mcs.anl.gov/projects/mpich2/ticket/297
104 - emake -j1 || die
105 -
106 }
107
108 src_install() {