git: ba6bf794a87e - main - net/openmpi: update 5.0.3 → 5.0.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 21 Jul 2024 12:47:59 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ba6bf794a87e4c66dde92b57161e1fc6e58f7af9

commit ba6bf794a87e4c66dde92b57161e1fc6e58f7af9
Author:     Laurent Chardon <laurent.chardon@gmail.com>
AuthorDate: 2024-07-21 12:24:19 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-21 12:38:47 +0000

    net/openmpi: update 5.0.3 → 5.0.4
    
    - Remove slurm from default options
    - Reinstate romio in default option
    - Remove level-zero dependency
    
    Changelog:
    https://docs.open-mpi.org/en/v5.0.x/release-notes/changelog/v5.0.x.html#open-mpi-version-v5-0-4
    
    PR:     280369
---
 net/openmpi/Makefile                               | 53 +++++++++-------------
 net/openmpi/distinfo                               |  6 +--
 .../files/patch-3rd-party_romio341_mpl_configure   | 12 +++++
 net/openmpi/pkg-plist                              | 12 ++---
 4 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index ea65e2efe6ed..b9aa9d2569c0 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	openmpi
-PORTVERSION=	5.0.3
-PORTREVISION=	2
+PORTVERSION=	5.0.4
 CATEGORIES=	net parallel
 MASTER_SITES=	https://download.open-mpi.org/release/open-mpi/v${PORTVERSION:R}/
 
@@ -11,29 +10,24 @@ WWW=		https://www.open-mpi.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NOT_FOR_ARCHS=	armv6 armv7 i386 powerpc
+NOT_FOR_ARCHS=		armv6 armv7 i386 powerpc
 NOT_FOR_ARCHS_REASON=	Not supported on 32-bits - see net/openmpi4
 
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2 \
 		libevent.so:devel/libevent \
-		libmunge.so:security/munge \
-		libze_loader.so:devel/level-zero
+		libmunge.so:security/munge
 
 # :keepla because port uses lt_dlopen
 USES=		compiler:c11 fortran gmake libtool:keepla localbase perl5 \
 		pkgconfig python:build shebangfix tar:bzip2
-
-CONFLICTS_INSTALL=	openmpi4-4*
-
-BINARY_ALIAS=	python3=${PYTHON_CMD}
-
+USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib
 USE_PERL5=	build
+SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
+		ompi/mca/common/monitoring/aggregate_profile.pl
 
 MPIBASE?=	mpi
 MPIDIR?=	${MPIBASE}/${PKGBASE}
 
-PLIST_SUB+=	MPIDIR=${MPIDIR}
-
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${PREFIX}/${MPIDIR}
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/${MPIDIR}/share
@@ -44,22 +38,18 @@ CONFIGURE_ARGS+=	--program-prefix= \
 			--with-libevent=external \
 			--enable-mca-no-build=verbs,btl_openib,oob_ud \
 			--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
-CFLAGS+=	${CFLAGS_F2018}
-
-# See <https://github.com/open-mpi/ompi/issues/9715>
-CONFIGURE_ARGS+=	--disable-io-romio
-
-USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib
-
-TEST_TARGET=	check
+TEST_TARGET=		check
+CFLAGS+=		${CFLAGS_F2018}
+CONFLICTS_INSTALL=	openmpi4-4*
 
+DOCSDIR=	${PREFIX}/${MPIDIR}/share/doc
 MANDIRS=	${PREFIX}/${MPIDIR}/share/man
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+PLIST_SUB+=	MPIDIR=${MPIDIR}
+PORTDOCS=	*
 
-SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
-		ompi/mca/common/monitoring/aggregate_profile.pl
-
-OPTIONS_DEFINE=			AVX DEBUG DOCS IPV6 SLURM
-OPTIONS_DEFAULT=		SLURM
+OPTIONS_DEFINE=			AVX DEBUG DOCS IPV6 ROMIO SLURM
+OPTIONS_DEFAULT=		ROMIO
 OPTIONS_EXCLUDE_aarch64=	AVX
 OPTIONS_EXCLUDE_armv6=		AVX SLURM
 OPTIONS_EXCLUDE_armv7=		AVX SLURM
@@ -73,23 +63,24 @@ OPTIONS_EXCLUDE_riscv64=	AVX
 OPTIONS_SUB=			yes
 
 AVX_DESC=	Enable AVX instructions
+ROMIO_DESC=	Enable romio mpi-io support
 SLURM_DESC=	Enable SLURM support
 
 AVX_CONFIGURE_OFF=	--enable-mca-no-build=op-avx
 
-DEBUG_CONFIGURE_ENABLE=	debug
+DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}	\
 			${PYTHON_PKGNAMEPREFIX}recommonmark>0:textproc/py-recommonmark@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCSDIR=		${PREFIX}/${MPIDIR}/share/doc
-PORTDOCS=		*
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
-SLURM_CONFIGURE_WITH=	slurm
+ROMIO_CONFIGURE_OFF=	--disable-io-romio
+
 SLURM_LIB_DEPENDS=	libslurm.so:sysutils/slurm-wlm
+SLURM_CONFIGURE_WITH=	slurm
 
 .include <bsd.port.pre.mk>
 
@@ -109,12 +100,12 @@ PLIST_SUB+=	SHORTFLOAT=""
 PLIST_SUB+=	SHORTFLOAT="@comment "
 .endif
 
-LIBDIR2FIX=	oshmem/tools/wrappers opal/tools/wrappers	\
+LIBDIR2FIX=	oshmem/tools/wrappers opal/tools/wrappers \
 		3rd-party/openpmix ompi/tools/wrappers
 
 pre-configure:
 .for d in ${LIBDIR2FIX}
-	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g'	\
+	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \
 		${WRKSRC}/${d}/Makefile.in
 .endfor
 
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index f704a009f90c..226122f31186 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713783798
-SHA256 (openmpi-5.0.3.tar.bz2) = 990582f206b3ab32e938aa31bbf07c639368e4405dca196fabe7f0f76eeda90b
-SIZE (openmpi-5.0.3.tar.bz2) = 29761888
+TIMESTAMP = 1721394717
+SHA256 (openmpi-5.0.4.tar.bz2) = 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d
+SIZE (openmpi-5.0.4.tar.bz2) = 29992422
diff --git a/net/openmpi/files/patch-3rd-party_romio341_mpl_configure b/net/openmpi/files/patch-3rd-party_romio341_mpl_configure
new file mode 100644
index 000000000000..91d7a66e28ed
--- /dev/null
+++ b/net/openmpi/files/patch-3rd-party_romio341_mpl_configure
@@ -0,0 +1,12 @@
+--- 3rd-party/romio341/mpl/configure.orig	2024-07-21 08:39:24 UTC
++++ 3rd-party/romio341/mpl/configure
+@@ -17666,7 +17666,8 @@ fi
+ fi
+ 
+ 
+-if test "$have_gpu" = "no" ; then
++# Disable Level Zero - See https://github.com/open-mpi/ompi/issues/9715
++if test "$have_gpu" = "DISABLED" ; then
+     # Check Level Zero availability when no other GPU library is available
+ 
+ 
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 439a965e17c7..bf577f40a47f 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -274,7 +274,7 @@ libdata/pkgconfig/pmix.pc
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi.so.40
-%%MPIDIR%%/lib/libmpi.so.40.40.3
+%%MPIDIR%%/lib/libmpi.so.40.40.4
 %%MPIDIR%%/lib/libmpi_mpifh.la
 %%MPIDIR%%/lib/libmpi_mpifh.so
 %%MPIDIR%%/lib/libmpi_mpifh.so.40
@@ -286,19 +286,19 @@ libdata/pkgconfig/pmix.pc
 %%MPIDIR%%/lib/libmpi_usempif08.la
 %%MPIDIR%%/lib/libmpi_usempif08.so
 %%MPIDIR%%/lib/libmpi_usempif08.so.40
-%%MPIDIR%%/lib/libmpi_usempif08.so.40.40.1
+%%MPIDIR%%/lib/libmpi_usempif08.so.40.40.2
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so
 %%MPIDIR%%/lib/libopen-pal.so.80
-%%MPIDIR%%/lib/libopen-pal.so.80.0.3
+%%MPIDIR%%/lib/libopen-pal.so.80.0.4
 %%MPIDIR%%/lib/libpmix.la
 %%MPIDIR%%/lib/libpmix.so
 %%MPIDIR%%/lib/libpmix.so.2
-%%MPIDIR%%/lib/libpmix.so.2.13.2
+%%MPIDIR%%/lib/libpmix.so.2.13.3
 %%MPIDIR%%/lib/libprrte.la
 %%MPIDIR%%/lib/libprrte.so
 %%MPIDIR%%/lib/libprrte.so.3
-%%MPIDIR%%/lib/libprrte.so.3.0.5
+%%MPIDIR%%/lib/libprrte.so.3.0.6
 %%MPIDIR%%/lib/mpi.mod
 %%MPIDIR%%/lib/mpi_ext.mod
 %%MPIDIR%%/lib/mpi_f08.mod
@@ -847,7 +847,7 @@ libdata/pkgconfig/pmix.pc
 %%MPIDIR%%/share/prte/help-dash-host.txt
 %%MPIDIR%%/share/prte/help-errmgr-base.txt
 %%MPIDIR%%/share/prte/help-ess-base.txt
-%%MPIDIR%%/share/prte/help-hostfiles.txt
+%%MPIDIR%%/share/prte/help-hostfile.txt
 %%MPIDIR%%/share/prte/help-iof-base.txt
 %%MPIDIR%%/share/prte/help-oob-base.txt
 %%MPIDIR%%/share/prte/help-oob-tcp.txt