aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/mpi-providers.eclass2
-rw-r--r--sys-cluster/mpich/Manifest3
-rw-r--r--sys-cluster/mpich/metadata.xml10
-rw-r--r--sys-cluster/mpich/mpich-3.2.ebuild2
-rw-r--r--sys-cluster/openmpi/Manifest2
-rw-r--r--sys-cluster/openmpi/metadata.xml10
-rw-r--r--sys-cluster/openmpi/openmpi-2.1.1.ebuild178
7 files changed, 11 insertions, 196 deletions
diff --git a/eclass/mpi-providers.eclass b/eclass/mpi-providers.eclass
index bb7207d..159d15e 100644
--- a/eclass/mpi-providers.eclass
+++ b/eclass/mpi-providers.eclass
@@ -35,8 +35,8 @@ mpi-providers_safe_mv() {
mv "${T}/DOCS" "${ED}/usr/share/doc" ||die "mv failed"
cd "${mpi_root}/etc"
- find -O3 -mindepth 1 -maxdepth 1 ! -path "./${PF}*" -execdir cp -a -t "${PF}" '{}' \; || die "find failed"
+ find -O3 -mindepth 1 -maxdepth 1 ! -path "./${PF}*" -execdir cp -a -t "${PF}" '{}' \; || die "find failed"
}
# @ECLASS-FUNCTION: mpi-providers_sysconfdir
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index 4157d9a..6d80908 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,2 +1,3 @@
DIST mpich-3.2.tar.gz 11862150 SHA256 0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc SHA512 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717 WHIRLPOOL 4196be94f5f5766f06e3f5893153e6d44fe93a5ef17dfcf3fce075b1506d5b762ba175dceeac0668284adc9f4a846917801f2138ed2d81f464d3a191b3f88f1c
-EBUILD mpich-3.2.ebuild 2621 SHA256 a636246c389d7e1ff11e9e6fc9c48319bd95f7a9cc5d894760d2d7b7add92a31 SHA512 3873e474334b552e032a153cd1187f84f18b902a28f9a1c4f29819b5cd66a44e2765198049d4db21fb2d1eacccc88fec16425efe7d83e5564c1f08fd393280ad WHIRLPOOL db1be1c638f8f325a8f069ed250b0932f2ba95c4d7e8ded955d126381f24f1a80cdb10e10e4672db6160174e3d0c6d119c8fa7d6f9ffe164410acf4437a6f8df
+EBUILD mpich-3.2.ebuild 2621 SHA256 e80568758afe0538ce78bcecb1d5dfd166464031ced3841984c82bc17206e1e2 SHA512 7554f4b59e09ffc054ad82c6f158bbca060000adae028708f1565eac5137fe0cc65b65daa787c37772e2e86007d48c74a1dc76af00d29b034c0d1c295dabc97f WHIRLPOOL 9354cd52b99e19403bd5f2eef8c12e29a53ce8d1c93214e3935196f68cbe962a9e31195406a061d4950e4c2892621156d237a4579a4b2738f618eaf1501a5e53
+MISC metadata.xml 331 SHA256 a8ff3810eb668800263cb2428561c7d1509961d3a220610e784ec20f4d9fe569 SHA512 135c70fbdec86377a5eb0d4afa9d7d58280b2ad282d0073f1d2dcc3598e4056f4a1fcdeaf62f993eb997981c7c946a2a130c439a1b20c76e913b5f2cffb274fc WHIRLPOOL a6b9b9e48eab7cd14d9efded5abe970289a804d74ff201765f3a5bc38099a599e26c563cfda9c059ded596287788f2a10ae3ee0600835f91bae23209eb0b0955
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
index 27db59f..643adbc 100644
--- a/sys-cluster/mpich/metadata.xml
+++ b/sys-cluster/mpich/metadata.xml
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
-<email>michael.gilroy24@gmail.com</email>
-</maintainer>
+ <maintainer type="person">
+ <email>michael.gilroy24@gmail.com</email>
+ </maintainer>
<longdescription lang="en">
MPICH 3.2
</longdescription>
+
+ <use>
+ <flag name="romio"></flag>
+ </use>
</pkgmetadata>
diff --git a/sys-cluster/mpich/mpich-3.2.ebuild b/sys-cluster/mpich/mpich-3.2.ebuild
index 10ae200..b85ee84 100644
--- a/sys-cluster/mpich/mpich-3.2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
deleted file mode 100644
index a19f8ee..0000000
--- a/sys-cluster/openmpi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST openmpi-2.1.1.tar.bz2 8242859 SHA256 bd7badd4ff3afa448c0d7f3ca0ee6ce003b957e9954aa87d8e4435759b5e4d16 SHA512 c11bba6ec815f9c8d32fce3578f8995f6cd694e02fb850d7e6cd3975989bb38fdbef348064264a1de418d0a21411c70ca74347ecff4f27eb5a2f6835019d6bca WHIRLPOOL a1bda50b6ea982333b79feb2883b0e5f04f19f973fe50c467ffd209b4ff3a693b1b8378c25bc5afa5ccf7304d460938a15edbd24bc6119c1bb0b36f94dff6ac4
-EBUILD openmpi-2.1.1.ebuild 5778 SHA256 70f4fd7915665729a6933df6c0e800ea7f2c57e62055d14277beae0325b50d0c SHA512 61b8cce5778ca72d9aa5137dee645af1463a8d8f6f5953a5d699658a82541ab6227a64fcbc3c824c50385aa64624daa1c6359c6f67d2c9e919de982597120caf WHIRLPOOL e4261d9ae8a010ee43c75cab0d0438c15baee275e64462d6c881c765666c9808443943a75ecbe2d6701d6cdd476fb484beff555b2090a6b320af316cede2cb99
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
deleted file mode 100644
index 46ea413..0000000
--- a/sys-cluster/openmpi/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>michael.gilroy24@gmail.com</email>
-</maintainer>
- <longdescription lang="en">
- openmpi 2.1.1
- </longdescription>
-</pkgmetadata>
diff --git a/sys-cluster/openmpi/openmpi-2.1.1.ebuild b/sys-cluster/openmpi/openmpi-2.1.1.ebuild
deleted file mode 100644
index e502923..0000000
--- a/sys-cluster/openmpi/openmpi-2.1.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs versionator multilib-minimal mpi-providers
-
-MY_P=${P/-mpi}
-S=${WORKDIR}/${MY_P}
-
-IUSE_OPENMPI_FABRICS="
- openmpi_fabrics_ofed
- openmpi_fabrics_knem
- 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"
-
-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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
-IUSE="cxx elibc_FreeBSD fortran ipv6 java threads numa cuda
- ${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 )"
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-CDEPEND="
- !sys-cluster/mpich
- !sys-cluster/mpich2
- !sys-cluster/nullmpi
- !sys-cluster/mpiexec
- >=dev-libs/libevent-2.0.22[${MULTILIB_USEDEP},threads]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=sys-apps/hwloc-1.11.2[${MULTILIB_USEDEP},numa?]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
- elibc_FreeBSD? ( dev-libs/libexecinfo )
- openmpi_fabrics_ofed? ( sys-fabric/ofed:* )
- openmpi_fabrics_knem? ( sys-cluster/knem )
- openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* )
- openmpi_rm_pbs? ( sys-cluster/torque )
- openmpi_rm_slurm? ( sys-cluster/slurm )
- openmpi_ofed_features_rdmacm? ( sys-fabric/librdmacm:* )"
-
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.6 )"
-
-DEPEND="${CDEPEND}
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/mpi.h
- /usr/include/openmpi/ompi/mpi/java/mpiJava.h
-)
-
-pkg_setup() {
- fortran-2_pkg_setup
- java-pkg-opt-2_pkg_setup
-
- elog
- 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."
- elog
-}
-
-src_prepare() {
- default
-
- # 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 || die
- fi
-}
-
-multilib_src_configure() {
- if use java; then
- # We must always build with the right -source and -target
- # flags. Passing flags to javac isn't explicitly supported here
- # but we can cheat by overriding the configure test for javac.
- export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
- fi
-
- ECONF_SOURCE=${S} econf \
- --sysconfdir="${EPREFIX}/etc/${PN}" \
- --enable-pretty-print-stacktrace \
- --enable-orterun-prefix-by-default \
- --with-hwloc="${EPREFIX}/usr" \
- --with-libltdl="${EPREFIX}/usr" \
- --with-libevent="${EPREFIX}/usr" \
- --enable-mpi-fortran=$(usex fortran all no) \
- $(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) \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable java mpi-java) \
- $(multilib_native_use_enable mpi-threads mpi-thread-multiple) \
- $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
- $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
- $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
- $(multilib_native_use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
- $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
- $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \
- $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
- $(multilib_native_use_with openmpi_rm_pbs tm) \
- $(multilib_native_use_with openmpi_rm_slurm slurm)
-}
-
-multilib_src_test() {
- # Doesn't work with the default src_test as the dry run (-n) fails.
- emake -j1 check
-}
-
-multilib_src_install() {
- default
-
- # fortran header cannot be wrapped (bug #540508), workaround part 1
- if multilib_is_native_abi && use fortran; then
- mkdir "${T}"/fortran || die
- mv "${ED}"usr/include/mpif* "${T}"/fortran || die
- else
- # some fortran files get installed unconditionally
- rm \
- "${ED}"usr/include/mpif* \
- "${ED}"usr/bin/mpif* \
- "${ED}"usr/bin/oshfort \
- "${ED}"usr/bin/shmemfort \
- || die
- fi
-}
-
-multilib_src_install_all() {
- # fortran header cannot be wrapped (bug #540508), workaround part 2
- if use fortran; then
- mv "${T}"/fortran/mpif* "${ED}"usr/include || die
- fi
-
- # Remove la files, no static libs are installed and we have pkg-config
- find "${ED}" -name '*.la' -delete || die
-
- if use java; then
- local mpi_jar="${ED}"usr/$(get_libdir)/mpi.jar
- java-pkg_dojar "${mpi_jar}"
- # We don't want to install the jar file twice
- # so let's clean after ourselves.
- rm "${mpi_jar}" || die
- fi
-
- einstalldocs
- mpi-providers_safe_mv || die
-}