Attachment #252201 for bug #280369




PORTNAME=	openmpi
PORTVERSION=	5.0.4
PORTREVISION=	2
CATEGORIES=	net parallel
MASTER_SITES=	https://download.open-mpi.org/release/open-mpi/v${PORTVERSION:R}/



LIB_DEPENDS=	libhwloc.so:devel/hwloc2 \
		libevent.so:devel/libevent \
		libmunge.so:security/munge
		libze_loader.so:devel/level-zero

# :keepla because port uses lt_dlopen
USES=		compiler:c11 fortran gmake libtool:keepla localbase perl5 \

			--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

SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
		ompi/mca/common/monitoring/aggregate_profile.pl

OPTIONS_DEFINE=			AVX DEBUG DOCS IPV6 SLURM ROMIO
OPTIONS_DEFAULT=		ROMIO
OPTIONS_EXCLUDE_aarch64=	AVX
OPTIONS_EXCLUDE_armv6=		AVX SLURM
OPTIONS_EXCLUDE_armv7=		AVX SLURM


AVX_DESC=	Enable AVX instructions
SLURM_DESC=	Enable SLURM support
ROMIO_DESC=	Enable romio mpi-io support

AVX_CONFIGURE_OFF=	--enable-mca-no-build=op-avx
ROMIO_CONFIGURE_OFF=	--disable-io-romio

DEBUG_CONFIGURE_ENABLE=	debug
DEBUG_INSTALL_TARGET_OFF=	install-strip

Lines 1-3 Link Here

(-)b/net/openmpi/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1713783798	1	TIMESTAMP = 1721394717
2	SHA256 (openmpi-5.0.3.tar.bz2) = 990582f206b3ab32e938aa31bbf07c639368e4405dca196fabe7f0f76eeda90b	2	SHA256 (openmpi-5.0.4.tar.bz2) = 64526852cdd88b2d30e022087c16ab3e03806c451b10cd691d5c1ac887d8ef9d
3	SIZE (openmpi-5.0.3.tar.bz2) = 29761888	3	SIZE (openmpi-5.0.4.tar.bz2) = 29992422




--- 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
 
 




%%MPIDIR%%/lib/libmpi.la
%%MPIDIR%%/lib/libmpi.so
%%MPIDIR%%/lib/libmpi.so.40
%%MPIDIR%%/lib/libmpi.so.40.40.4
%%MPIDIR%%/lib/libmpi_mpifh.la
%%MPIDIR%%/lib/libmpi_mpifh.so
%%MPIDIR%%/lib/libmpi_mpifh.so.40

%%MPIDIR%%/lib/libmpi_usempif08.la
%%MPIDIR%%/lib/libmpi_usempif08.so
%%MPIDIR%%/lib/libmpi_usempif08.so.40
%%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.4
%%MPIDIR%%/lib/libpmix.la
%%MPIDIR%%/lib/libpmix.so
%%MPIDIR%%/lib/libpmix.so.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.6
%%MPIDIR%%/lib/mpi.mod
%%MPIDIR%%/lib/mpi_ext.mod
%%MPIDIR%%/lib/mpi_f08.mod

%%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-hostfile.txt
%%MPIDIR%%/share/prte/help-iof-base.txt
%%MPIDIR%%/share/prte/help-oob-base.txt
%%MPIDIR%%/share/prte/help-oob-tcp.txt
- 

Return to bug 280369

Lines 274-280 libdata/pkgconfig/pmix.pc Link Here

(-)b/net/openmpi/pkg-plist (-7 / +6 lines)
274	%%MPIDIR%%/lib/libmpi.la	274	%%MPIDIR%%/lib/libmpi.la
275	%%MPIDIR%%/lib/libmpi.so	275	%%MPIDIR%%/lib/libmpi.so
276	%%MPIDIR%%/lib/libmpi.so.40	276	%%MPIDIR%%/lib/libmpi.so.40
277	%%MPIDIR%%/lib/libmpi.so.40.40.3	277	%%MPIDIR%%/lib/libmpi.so.40.40.4
278	%%MPIDIR%%/lib/libmpi_mpifh.la	278	%%MPIDIR%%/lib/libmpi_mpifh.la
279	%%MPIDIR%%/lib/libmpi_mpifh.so	279	%%MPIDIR%%/lib/libmpi_mpifh.so
280	%%MPIDIR%%/lib/libmpi_mpifh.so.40	280	%%MPIDIR%%/lib/libmpi_mpifh.so.40
Lines 286-304 libdata/pkgconfig/pmix.pc Link Here
286	%%MPIDIR%%/lib/libmpi_usempif08.la	286	%%MPIDIR%%/lib/libmpi_usempif08.la
287	%%MPIDIR%%/lib/libmpi_usempif08.so	287	%%MPIDIR%%/lib/libmpi_usempif08.so
288	%%MPIDIR%%/lib/libmpi_usempif08.so.40	288	%%MPIDIR%%/lib/libmpi_usempif08.so.40
289	%%MPIDIR%%/lib/libmpi_usempif08.so.40.40.1	289	%%MPIDIR%%/lib/libmpi_usempif08.so.40.40.2
290	%%MPIDIR%%/lib/libopen-pal.la	290	%%MPIDIR%%/lib/libopen-pal.la
291	%%MPIDIR%%/lib/libopen-pal.so	291	%%MPIDIR%%/lib/libopen-pal.so
292	%%MPIDIR%%/lib/libopen-pal.so.80	292	%%MPIDIR%%/lib/libopen-pal.so.80
293	%%MPIDIR%%/lib/libopen-pal.so.80.0.3	293	%%MPIDIR%%/lib/libopen-pal.so.80.0.4
294	%%MPIDIR%%/lib/libpmix.la	294	%%MPIDIR%%/lib/libpmix.la
295	%%MPIDIR%%/lib/libpmix.so	295	%%MPIDIR%%/lib/libpmix.so
296	%%MPIDIR%%/lib/libpmix.so.2	296	%%MPIDIR%%/lib/libpmix.so.2
297	%%MPIDIR%%/lib/libpmix.so.2.13.2	297	%%MPIDIR%%/lib/libpmix.so.2.13.3
298	%%MPIDIR%%/lib/libprrte.la	298	%%MPIDIR%%/lib/libprrte.la
299	%%MPIDIR%%/lib/libprrte.so	299	%%MPIDIR%%/lib/libprrte.so
300	%%MPIDIR%%/lib/libprrte.so.3	300	%%MPIDIR%%/lib/libprrte.so.3
301	%%MPIDIR%%/lib/libprrte.so.3.0.5	301	%%MPIDIR%%/lib/libprrte.so.3.0.6
302	%%MPIDIR%%/lib/mpi.mod	302	%%MPIDIR%%/lib/mpi.mod
303	%%MPIDIR%%/lib/mpi_ext.mod	303	%%MPIDIR%%/lib/mpi_ext.mod
304	%%MPIDIR%%/lib/mpi_f08.mod	304	%%MPIDIR%%/lib/mpi_f08.mod
Lines 847-853 libdata/pkgconfig/pmix.pc Link Here
847	%%MPIDIR%%/share/prte/help-dash-host.txt	847	%%MPIDIR%%/share/prte/help-dash-host.txt
848	%%MPIDIR%%/share/prte/help-errmgr-base.txt	848	%%MPIDIR%%/share/prte/help-errmgr-base.txt
849	%%MPIDIR%%/share/prte/help-ess-base.txt	849	%%MPIDIR%%/share/prte/help-ess-base.txt
850	%%MPIDIR%%/share/prte/help-hostfiles.txt	850	%%MPIDIR%%/share/prte/help-hostfile.txt
851	%%MPIDIR%%/share/prte/help-iof-base.txt	851	%%MPIDIR%%/share/prte/help-iof-base.txt
852	%%MPIDIR%%/share/prte/help-oob-base.txt	852	%%MPIDIR%%/share/prte/help-oob-base.txt
853	%%MPIDIR%%/share/prte/help-oob-tcp.txt	853	%%MPIDIR%%/share/prte/help-oob-tcp.txt
854	-

Lines 1-6 Link Here

(-)b/net/openmpi/Makefile (-9 / +6 lines)
1	PORTNAME= openmpi	1	PORTNAME= openmpi
2	PORTVERSION= 5.0.3	2	PORTVERSION= 5.0.4
3	PORTREVISION= 2
4	CATEGORIES= net parallel	3	CATEGORIES= net parallel
5	MASTER_SITES= https://download.open-mpi.org/release/open-mpi/v${PORTVERSION:R}/	4	MASTER_SITES= https://download.open-mpi.org/release/open-mpi/v${PORTVERSION:R}/
6		5
Lines 16-23 NOT_FOR_ARCHS_REASON= Not supported on 32-bits - see net/openmpi4 Link Here
16		15
17	LIB_DEPENDS= libhwloc.so:devel/hwloc2 \	16	LIB_DEPENDS= libhwloc.so:devel/hwloc2 \
18	libevent.so:devel/libevent \	17	libevent.so:devel/libevent \
19	libmunge.so:security/munge \	18	libmunge.so:security/munge
20	libze_loader.so:devel/level-zero
21		19
22	# :keepla because port uses lt_dlopen	20	# :keepla because port uses lt_dlopen
23	USES= compiler:c11 fortran gmake libtool:keepla localbase perl5 \	21	USES= compiler:c11 fortran gmake libtool:keepla localbase perl5 \
Lines 46-54 CONFIGURE_ARGS+= --program-prefix= \ Link Here
46	--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}	44	--with-wrapper-ldflags=-Wl,-rpath=-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
47	CFLAGS+= ${CFLAGS_F2018}	45	CFLAGS+= ${CFLAGS_F2018}
48		46
49	# See <https://github.com/open-mpi/ompi/issues/9715>
50	CONFIGURE_ARGS+= --disable-io-romio
51
52	USE_LDCONFIG= ${PREFIX}/${MPIDIR}/lib	47	USE_LDCONFIG= ${PREFIX}/${MPIDIR}/lib
53		48
54	TEST_TARGET= check	49	TEST_TARGET= check
Lines 58-65 MANDIRS= ${PREFIX}/${MPIDIR}/share/man Link Here
58	SHEBANG_FILES= ompi/mca/common/monitoring/profile2mat.pl \	53	SHEBANG_FILES= ompi/mca/common/monitoring/profile2mat.pl \
59	ompi/mca/common/monitoring/aggregate_profile.pl	54	ompi/mca/common/monitoring/aggregate_profile.pl
60		55
61	OPTIONS_DEFINE= AVX DEBUG DOCS IPV6 SLURM	56	OPTIONS_DEFINE= AVX DEBUG DOCS IPV6 SLURM ROMIO
62	OPTIONS_DEFAULT= SLURM	57	OPTIONS_DEFAULT= ROMIO
63	OPTIONS_EXCLUDE_aarch64= AVX	58	OPTIONS_EXCLUDE_aarch64= AVX
64	OPTIONS_EXCLUDE_armv6= AVX SLURM	59	OPTIONS_EXCLUDE_armv6= AVX SLURM
65	OPTIONS_EXCLUDE_armv7= AVX SLURM	60	OPTIONS_EXCLUDE_armv7= AVX SLURM
Lines 74-81 OPTIONS_SUB= yes Link Here
74		69
75	AVX_DESC= Enable AVX instructions	70	AVX_DESC= Enable AVX instructions
76	SLURM_DESC= Enable SLURM support	71	SLURM_DESC= Enable SLURM support
		72	ROMIO_DESC= Enable romio mpi-io support
77		73
78	AVX_CONFIGURE_OFF= --enable-mca-no-build=op-avx	74	AVX_CONFIGURE_OFF= --enable-mca-no-build=op-avx
		75	ROMIO_CONFIGURE_OFF= --disable-io-romio
79		76
80	DEBUG_CONFIGURE_ENABLE= debug	77	DEBUG_CONFIGURE_ENABLE= debug
81	DEBUG_INSTALL_TARGET_OFF= install-strip	78	DEBUG_INSTALL_TARGET_OFF= install-strip

Added Link Here

(-)b/net/openmpi/files/patch-3rd-party_romio341_mpl_configure (+12 lines)
1	--- 3rd-party/romio341/mpl/configure.orig 2024-07-21 08:39:24 UTC
2	+++ 3rd-party/romio341/mpl/configure
3	@@ -17666,7 +17666,8 @@ fi
4	fi
5
6
7	-if test "$have_gpu" = "no" ; then
8	+# Disable Level Zero - See https://github.com/open-mpi/ompi/issues/9715
9	+if test "$have_gpu" = "DISABLED" ; then
10	# Check Level Zero availability when no other GPU library is available
11
12