From 27ca2f6ade1dc518260b01c42c1e620b012ebb79 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 25 Nov 2023 20:38:55 -0500 Subject: [PATCH] openmpi: update to 5.0.1. Closes: #47440. --- common/shlibs | 16 +++++++--------- srcpkgs/openmpi/INSTALL.msg | 6 ++++++ srcpkgs/openmpi/template | 25 +++++++++++++------------ 3 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 srcpkgs/openmpi/INSTALL.msg diff --git a/common/shlibs b/common/shlibs index a0cddb2729e..cc42af6682a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -707,15 +707,13 @@ libapr-1.so.0 apr-1.4.2_1 libaprutil-1.so.0 apr-util-1.6.1_11 libnetpgp.so.0 libnetpgp-20140220_19 libmj.so.0 libmj-20140220_19 -libmca_common_sm.so.40 libopenmpi-3.0.1_1 -libmca_common_dstore.so.1 libopenmpi-4.0.1_1 -libmca_common_ompio.so.41 libopenmpi-3.0.1_1 -libmca_common_monitoring.so.50 libopenmpi-3.1.2_1 -libmpi.so.40 libopenmpi-3.0.1_1 -libompitrace.so.40 libopenmpi-3.0.1_1 -libopen-pal.so.40 libopenmpi-3.0.1_1 -libopen-rte.so.40 libopenmpi-3.0.1_1 -liboshmem.so.40 libopenmpi-3.0.1_1 +libmpi.so.40 libopenmpi-5.0.1_1 +libmpi_mpifh.so.40 libopenmpi-5.0.1_1 +libmpi_usempi_ignore_tkr.so.40 libopenmpi-5.0.1_1 +libmpi_usempif08.so.40 libopenmpi-5.0.1_1 +libopen-pal.so.80 libopenmpi-5.0.1_1 +libpmix.so.2 libopenmpi-5.0.1_1 +libprrte.so.3 libopenmpi-5.0.1_1 libmtp.so.9 libmtp-1.1.4_1 libelf.so.1 libelf-0.155_1 libdw.so.1 libelf-0.155_1 diff --git a/srcpkgs/openmpi/INSTALL.msg b/srcpkgs/openmpi/INSTALL.msg new file mode 100644 index 00000000000..fb6e4c11b73 --- /dev/null +++ b/srcpkgs/openmpi/INSTALL.msg @@ -0,0 +1,6 @@ +OpenMPI 5.0 and beyond moves from the ORTE runtime to PRRTE. Refer to + + https://www.open-mpi.org/software/ompi/major-changes.php + +for more details. Furthermore, configuration files for PRRTE and OpenMPI +should now be placed in /etc/openmpi rather than directly in /etc. diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index d03c1356c88..f8f137fcfad 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -1,22 +1,22 @@ # Template file for 'openmpi' pkgname=openmpi -version=4.1.6 +version=5.0.1 revision=1 +# OpenMPI >= 5 is 64-bit only +archs="x86_64* aarch64* ppc64* riscv64" build_style=gnu-configure -configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr - --libdir=\${prefix}/lib${XBPS_TARGET_WORDSIZE}" -hostmakedepends="perl pkg-config automake libtool" +configure_args="--enable-ipv6 --with-pmix=internal --with-prrte=internal \ + --libdir=\${prefix}/lib${XBPS_TARGET_WORDSIZE} --sysconfdir=/etc/openmpi \ + --with-hwloc=${XBPS_CROSS_BASE}/usr " +hostmakedepends="perl pkg-config python3" makedepends="libgomp-devel libhwloc-devel zlib-devel libevent-devel" -conf_files=" - /etc/openmpi-default-hostfile - /etc/openmpi-mca-params.conf - /etc/openmpi-totalview.tcl" +conf_files="/etc/openmpi/*" short_desc="High Performance Message Passing Library" maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://www.open-mpi.org/" distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${version}.tar.bz2" -checksum=f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415 +checksum=e357043e65fd1b956a47d0dae6156a90cf0e378df759364936c1781f1a25ef80 lib32disabled=yes if [ "${CROSS_BUILD}" ]; then @@ -29,7 +29,6 @@ fi post_patch() { vsed -e 's,sys/unistd.h,unistd.h,g' -i opal/include/opal/sys/cma.h - vsed -e '1i#include ' -i opal/mca/pmix/pmix3x/pmix/include/pmix_server.h } pre_configure() { @@ -39,8 +38,6 @@ pre_configure() { post_install() { vlicense LICENSE - # https://github.com/void-linux/void-packages/pull/28996#issuecomment-784255185 - mv "${DESTDIR}/usr/lib/ompi_monitoring_prof.so" "${DESTDIR}/usr/lib/openmpi" } libopenmpi_package() { @@ -59,5 +56,9 @@ openmpi-devel_package() { vmove usr/lib/pkgconfig vmove usr/share/man/man3 vmove "usr/lib/*.so" + + if [ -z "${CROSS_BUILD}" ]; then + vmove "usr/lib/*.mod" + fi } }