commit: b67d4a39cf3697c247a6ce129846e77736ce7e9f Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jan 16 18:26:48 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jan 16 18:26:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67d4a39
sys-cluster/openmpi: remove USE=openmpi_fabrics_psm Closes: https://bugs.gentoo.org/831003 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-cluster/openmpi/openmpi-1.10.7.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild | 15 ++++++--------- sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild | 13 +++++-------- sys-cluster/openmpi/openmpi-4.0.7.ebuild | 13 +++++-------- sys-cluster/openmpi/openmpi-4.1.2.ebuild | 13 +++++-------- 10 files changed, 57 insertions(+), 87 deletions(-) diff --git a/sys-cluster/openmpi/openmpi-1.10.7.ebuild b/sys-cluster/openmpi/openmpi-1.10.7.ebuild index 2f7dc01da22f..bd10c4fe0ad4 100644 --- a/sys-cluster/openmpi/openmpi-1.10.7.ebuild +++ b/sys-cluster/openmpi/openmpi-1.10.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -36,9 +35,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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 ) @@ -63,12 +62,11 @@ CDEPEND=" <sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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:* )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.6 )" @@ -138,7 +136,6 @@ multilib_src_configure() { $(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) \ diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild index 6c2e0849a42f..8319c92e65d2 100644 --- a/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild +++ b/sys-cluster/openmpi/openmpi-1.7.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,8 +13,7 @@ S="${WORKDIR}"/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -36,9 +35,9 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="cma cuda +cxx fortran heterogeneous ipv6 mpi-threads romio threads vt ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_rdmacm? ( openmpi_fabrics_ofed ) @@ -59,12 +58,11 @@ RDEPEND=" dev-libs/libltdl:0 <sys-apps/hwloc-2:= cuda? ( dev-util/nvidia-cuda-toolkit ) - openmpi_fabrics_ofed? ( sys-fabric/ofed ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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 ) + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core ) " DEPEND="${RDEPEND}" @@ -137,7 +135,6 @@ src_configure() { $(use_enable ipv6) \ $(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \ $(use_with openmpi_fabrics_knem knem "${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) \ diff --git a/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild index 1fa495fae505..ac6ed9df845f 100644 --- a/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -36,9 +35,9 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="cma cuda +cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads vt ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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 ) @@ -61,12 +60,11 @@ CDEPEND=" <sys-apps/hwloc-2:=[numa?] sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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:* )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.6 )" @@ -137,7 +135,6 @@ src_configure() { $(use_enable mpi-threads mpi-thread-multiple) \ $(use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) \ $(use_with openmpi_fabrics_knem knem "${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) \ diff --git a/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild b/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild index d9a4f81bf34a..752a3ae1982f 100644 --- a/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-2.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -36,9 +35,9 @@ KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux" IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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 ) @@ -57,12 +56,11 @@ CDEPEND=" <sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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:* )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.6 )" @@ -124,7 +122,6 @@ multilib_src_configure() { $(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) \ diff --git a/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild b/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild index c37db55963e6..a6e5a26fe493 100644 --- a/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-2.1.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -34,9 +33,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="cma cuda cxx fortran heterogeneous ipv6 java mpi-threads numa romio threads ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) @@ -53,12 +52,11 @@ CDEPEND=" <sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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:* )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.6 )" @@ -120,7 +118,6 @@ multilib_src_configure() { $(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_rdmacm openib-rdmacm) \ $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \ diff --git a/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild b/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild index d54b56e6cd25..d17836c5e10d 100644 --- a/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-3.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -34,9 +33,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="cma cuda cxx fortran heterogeneous ipv6 java numa romio ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) @@ -53,12 +52,11 @@ CDEPEND=" <sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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:* )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.6 )" @@ -117,7 +115,6 @@ multilib_src_configure() { $(multilib_native_use_enable java mpi-java) \ $(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_rdmacm openib-rdmacm) \ $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \ diff --git a/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild b/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild index d54b56e6cd25..d17836c5e10d 100644 --- a/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-3.1.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -34,9 +33,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" IUSE="cma cuda cxx fortran heterogeneous ipv6 java numa romio ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) @@ -53,12 +52,11 @@ CDEPEND=" <sys-apps/hwloc-2:=[${MULTILIB_USEDEP},numa?] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( sys-fabric/ofed:* ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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:* )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.6 )" @@ -117,7 +115,6 @@ multilib_src_configure() { $(multilib_native_use_enable java mpi-java) \ $(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_rdmacm openib-rdmacm) \ $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) \ diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild index dedc2ebe1349..ef9a1e2bea64 100644 --- a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild +++ b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -34,9 +33,9 @@ KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux" IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) @@ -51,12 +50,11 @@ CDEPEND=" >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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-cluster/rdma-core sys-fabric/librdmacm:* ) )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.8:* )" @@ -129,7 +127,6 @@ multilib_src_configure() { $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) $(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_with openmpi_rm_pbs tm) $(multilib_native_use_with openmpi_rm_slurm slurm) ) diff --git a/sys-cluster/openmpi/openmpi-4.0.7.ebuild b/sys-cluster/openmpi/openmpi-4.0.7.ebuild index e7d49f6d7e45..543d4350d094 100644 --- a/sys-cluster/openmpi/openmpi-4.0.7.ebuild +++ b/sys-cluster/openmpi/openmpi-4.0.7.ebuild @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -35,9 +34,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) @@ -52,12 +51,11 @@ CDEPEND=" >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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-cluster/rdma-core sys-fabric/librdmacm:* ) )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.8:* )" @@ -130,7 +128,6 @@ multilib_src_configure() { $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) $(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_with openmpi_rm_pbs tm) $(multilib_native_use_with openmpi_rm_slurm slurm) ) diff --git a/sys-cluster/openmpi/openmpi-4.1.2.ebuild b/sys-cluster/openmpi/openmpi-4.1.2.ebuild index 314ce22c8b3a..bcdeed294796 100644 --- a/sys-cluster/openmpi/openmpi-4.1.2.ebuild +++ b/sys-cluster/openmpi/openmpi-4.1.2.ebuild @@ -12,8 +12,7 @@ S=${WORKDIR}/${MY_P} IUSE_OPENMPI_FABRICS=" openmpi_fabrics_ofed - openmpi_fabrics_knem - openmpi_fabrics_psm" + openmpi_fabrics_knem" IUSE_OPENMPI_RM=" openmpi_rm_pbs @@ -35,9 +34,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" IUSE="cma cuda cxx fortran ipv6 java libompitrace peruse romio ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" -REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) +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_udcm? ( openmpi_fabrics_ofed ) openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) @@ -52,12 +51,11 @@ CDEPEND=" >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) - openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) + openmpi_fabrics_ofed? ( sys-cluster/rdma-core ) 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-cluster/rdma-core sys-fabric/librdmacm:* ) )" + openmpi_ofed_features_rdmacm? ( sys-cluster/rdma-core )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.8:* )" @@ -136,7 +134,6 @@ multilib_src_configure() { $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) $(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_with openmpi_rm_pbs tm) $(multilib_native_use_with openmpi_rm_slurm slurm) )
