diff options
| author |   Nicolas Bock <nicolasbock@gmail.com> | 2013-07-03 10:40:14 -0600 |
|---|---|---|
| committer | Nicolas Bock <nicolasbock@gmail.com> | 2013-07-03 10:40:14 -0600 |
| commit | f13640f929310b6fc3e4bf27be55580957e8eb54 (patch) | |
| tree | c6fc5e8803802795589dbb63bbc38d9c3d1fa262 /sys-cluster | |
| parent | Version bump to 1-Jul-2013. (diff) | |
| download | sci-f13640f929310b6fc3e4bf27be55580957e8eb54.tar.gz sci-f13640f929310b6fc3e4bf27be55580957e8eb54.tar.bz2 sci-f13640f929310b6fc3e4bf27be55580957e8eb54.zip | |
Added more use flags, and fixed a few typos.
Package-Manager: portage-2.2.0_alpha186
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/charm/ChangeLog | 4 | ||||
| -rw-r--r-- | sys-cluster/charm/charm-6.5.1.ebuild | 46 | ||||
| -rw-r--r-- | sys-cluster/charm/metadata.xml | 3 |
3 files changed, 35 insertions, 18 deletions
diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index 4d51c0e33..6c7458273 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Jul 2013; Nicolas Bock <nicolasbock@gmail.com> charm-6.5.1.ebuild, + metadata.xml: + Added more use flags, and fixed a few typos. + 02 Jul 2013; Nicolas Bock <nicolasbock@gmail.com> +files/charm-6.5.0-charmc-gentoo.patch, charm-6.5.1.ebuild: Added missing patch. diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild index 74ba894be..5172428f2 100644 --- a/sys-cluster/charm/charm-6.5.1.ebuild +++ b/sys-cluster/charm/charm-6.5.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" LICENSE="charm" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp" +IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mlogft mpi numa smp static-libs syncft tcp" RDEPEND="mpi? ( virtual/mpi )" DEPEND=" @@ -30,31 +30,39 @@ REQUIRED_USE=" FORTRAN_STANDARD="90" -src_prepare() { +get_opts() { + local CHARM_OPTS + + # TCP instead of default UDP for socket comunication + # protocol + CHARM_OPTS+="$(usex tcp ' tcp' '')" + + # enable direct SMP support using shared memory + CHARM_OPTS+="$(usex smp ' smp' '')" + + CHARM_OPTS+="$(usex mlogft ' mlogft' '')" + CHARM_OPTS+="$(usex syncft ' syncft' '')" + # Build shared libraries by default. - CHARM_OPTS="--build-shared" + CHARM_OPTS+=" --build-shared" + if use charmproduction; then CHARM_OPTS+=" --with-production" else if use charmdebug; then - CHARM_OPTS+=" --with-charmdebug" + CHARM_OPTS+=" --enable-charmdebug" fi if use charmtracing; then - CHARM_OPTS+=" --with-tracing --with-tracing-commthread" + CHARM_OPTS+=" --enable-tracing --enable-tracing-commthread" fi fi - # TCP instead of default UDP for socket comunication - # protocol - CHARM_OPTS+="$(usex tcp ' tcp' '')" - - # enable direct SMP support using shared memory - CHARM_OPTS+="$(usex smp ' smp' '')" - - # CMK optimization - use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 + CHARM_OPTS+="$(usex numa ' --with-numa' '')" + echo $CHARM_OPTS +} +src_prepare() { sed \ -e "/CMK_CF90/s:f90:$(usex mpi "mpif90" "$(tc-getFC)"):g" \ -e "/CMK_CXX/s:g++:$(usex mpi "mpic++" "$(tc-getCXX)"):g" \ @@ -75,16 +83,18 @@ src_prepare() { src/scripts/Makefile \ src/arch/net/charmrun/Makefile || die - # Fix QA notice. - append-cflags -DALLOCA_H + # CMK optimization + use cmkopt && append-cppflags -DCMK_OPTIMIZE=1 - einfo "charm opts: ${CHARM_OPTS}" + # Fix QA notice. Filed report with upstream. + append-cflags -DALLOCA_H } src_compile() { # Build charmm++ first. + einfo "running ./build charm++ $(usex mpi 'mpi' 'net')-linux$(usex amd64 '-amd64' '') $(get_opts) ${MAKEOPTS} ${CFLAGS}" ./build charm++ $(usex mpi "mpi" "net")-linux$(usex amd64 "-amd64" '') \ - ${CHARM_OPTS} ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++" + $(get_opts) ${MAKEOPTS} ${CFLAGS} || die "Failed to build charm++" # make pdf/html docs if use doc; then diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml index ea5896e21..9300483fb 100644 --- a/sys-cluster/charm/metadata.xml +++ b/sys-cluster/charm/metadata.xml @@ -10,6 +10,9 @@ <flag name="charmproduction">Optimize performance of Charm++ runtime</flag> <flag name="charmtracing">Enable tracing support in Charm++</flag> <flag name="cmkopt">Enable CMK optimisation</flag> + <flag name="mlogft">Compile with Charm++ message logging fault tolerance support</flag> + <flag name="numa">support memory affinity with NUMA</flag> + <flag name="syncft">Compile with Charm++ fault tolerance support</flag> <flag name="tcp">Use TCP (instead of UPD) for socket communication</flag> </use> </pkgmetadata> |