jsbronder    15/02/17 01:17:42

  Modified:             metadata.xml ChangeLog
  Added:                openmpi-1.8.4-r2.ebuild
  Log:
  Add numa USE flag.  As xarthisius points out, this is probably desireable as 
it allows locking processes to CPUs.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
4D7043C9)

Revision  Changes    Path
1.16                 sys-cluster/openmpi/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/metadata.xml?rev=1.16&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/metadata.xml?rev=1.16&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/metadata.xml?r1=1.15&r2=1.16

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/metadata.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- metadata.xml        8 Apr 2014 09:45:34 -0000       1.15
+++ metadata.xml        17 Feb 2015 01:17:41 -0000      1.16
@@ -12,6 +12,7 @@
                platform support</flag>
                <flag name='romio'>Build the ROMIO MPI-IO component</flag>
                <flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
+               <flag name='numa'>Enable numactl to allow binding processes to 
CPUs</flag>
                <flag name='vt'>Enable bundled VampirTrace support</flag>
                <flag name="pbs">Add support for the Portable Batch System 
(PBS)</flag>
        </use>



1.131                sys-cluster/openmpi/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/ChangeLog?rev=1.131&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/ChangeLog?rev=1.131&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/ChangeLog?r1=1.130&r2=1.131

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- ChangeLog   4 Feb 2015 21:46:32 -0000       1.130
+++ ChangeLog   17 Feb 2015 01:17:41 -0000      1.131
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.130 
2015/02/04 21:46:32 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.131 
2015/02/17 01:17:41 jsbronder Exp $
+
+*openmpi-1.8.4-r2 (17 Feb 2015)
+
+  17 Feb 2015; Justin Bronder <[email protected]> +openmpi-1.8.4-r2.ebuild,
+  metadata.xml:
+  Add numa USE flag. As xarthisius points out, this is probably desireable as
+  it allows locking processes to CPUs.
 
 *openmpi-1.8.4-r1 (04 Feb 2015)
 *openmpi-1.8.3-r1 (04 Feb 2015)



1.1                  sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild?rev=1.1&content-type=text/plain

Index: openmpi-1.8.4-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.8.4-r2.ebuild,v 1.1 
2015/02/17 01:17:41 jsbronder Exp $

EAPI=5

FORTRAN_NEEDED=fortran

inherit autotools cuda eutils flag-o-matic fortran-2 multilib toolchain-funcs 
versionator

MY_P=${P/-mpi}
S=${WORKDIR}/${MY_P}

IUSE_OPENMPI_FABRICS="
        openmpi_fabrics_ofed
        openmpi_fabrics_knem
        openmpi_fabrics_open-mx
        openmpi_fabrics_psm"

IUSE_OPENMPI_RM="
        openmpi_rm_pbs
        openmpi_rm_slurm"

IUSE_OPENMPI_OFED_FEATURES="
        openmpi_ofed_features_control-hdr-padding
        openmpi_ofed_features_connectx-xrc
        openmpi_ofed_features_udcm
        openmpi_ofed_features_rdmacm
        openmpi_ofed_features_dynamic-sl
        openmpi_ofed_features_failover"

DESCRIPTION="A high-performance message passing library (MPI)"
HOMEPAGE="http://www.open-mpi.org";
SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 
1-2)/downloads/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
IUSE="cma cuda +cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads numa 
romio threads vt
        ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} 
${IUSE_OPENMPI_OFED_FEATURES}"

REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
        openmpi_rm_pbs? ( !openmpi_rm_slurm )
        openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
        openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
        openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
        openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed )
        openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
        openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
        openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"

MPI_UNCLASSED_DEP_STR="
        vt? (
                !dev-libs/libotf
                !app-text/lcdf-typetools
        )"

RDEPEND="
        !sys-cluster/mpich
        !sys-cluster/mpich2
        !sys-cluster/mpiexec
        dev-libs/libevent
        dev-libs/libltdl:0
        >=sys-apps/hwloc-1.9.1[numa?]
        sys-libs/zlib
        cuda? ( dev-util/nvidia-cuda-toolkit )
        elibc_FreeBSD? ( dev-libs/libexecinfo )
        openmpi_fabrics_ofed? ( sys-infiniband/ofed )
        openmpi_fabrics_knem? ( sys-cluster/knem )
        openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
        openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
        openmpi_rm_pbs? ( sys-cluster/torque )
        openmpi_rm_slurm? ( sys-cluster/slurm )
        openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
        "
DEPEND="${RDEPEND}"

pkg_setup() {
        fortran-2_pkg_setup

        if use mpi-threads; then
                echo
                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"
                echo
        fi

        echo
        elog "OpenMPI has an overwhelming count of configuration options."
        elog "Don't forget the EXTRA_ECONF environment variable can let you"
        elog "specify configure options if you find them necessary."
        echo
}

src_prepare() {
        # 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

        # https://github.com/open-mpi/ompi/issues/163
        epatch "${FILESDIR}"/openmpi-ltdl.patch

        AT_M4DIR=config eautoreconf
}

src_configure() {
        local myconf=(
                --sysconfdir="${EPREFIX}/etc/${PN}"
                --enable-pretty-print-stacktrace
                --enable-orterun-prefix-by-default
                --with-hwloc="${EPREFIX}/usr"
                --with-libltdl=external
                )

        if use mpi-threads; then
                myconf+=(--enable-mpi-threads
                        --enable-opal-multi-threads)
        fi

        if use fortran; then
                myconf+=(--enable-mpi-fortran=all)
        else
                myconf+=(--enable-mpi-fortran=no)
        fi

        ! use vt && myconf+=(--enable-contrib-no-build=vt)

        econf "${myconf[@]}" \
                $(use_enable cxx mpi-cxx) \
                $(use_with cma) \
                $(use_with cuda cuda "${EPREFIX}"/opt/cuda) \
                $(use_enable romio io-romio) \
                $(use_enable heterogeneous) \
                $(use_enable ipv6) \
                $(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
                $(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
                $(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
                $(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
                $(use_enable openmpi_ofed_features_control-hdr-padding 
openib-control-hdr-padding) \
                $(use_enable openmpi_ofed_features_connectx-xrc 
openib-connectx-xrc) \
                $(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
                $(use_enable openmpi_ofed_features_udcm openib-udcm) \
                $(use_enable openmpi_ofed_features_dynamic-sl 
openib-dynamic-sl) \
                $(use_enable openmpi_ofed_features_failover 
btl-openib-failover) \
                $(use_with openmpi_rm_pbs tm) \
                $(use_with openmpi_rm_slurm slurm)
}

src_install () {
        emake DESTDIR="${D}" install

        # From USE=vt see #359917
        rm "${ED}"/usr/share/libtool &> /dev/null

        # Avoid collisions with libevent
        rm -rf "${ED}"/usr/include/event2 &> /dev/null

        # Remove la files, no static libs are installed and we have pkg-config
        find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete

        dodoc README AUTHORS NEWS VERSION || die
}

src_test() {
        # Doesn't work with the default src_test as the dry run (-n) fails.
        emake -j1 check
}




Reply via email to