From 61df4659f6b2c4605045127e9a41a75e6bbeb5a2 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 4 Apr 2025 12:25:05 +0200 Subject: [PATCH 01/20] Rebuild for PMIX 5.0.7 From adb4f4609eeb94b2a074f57cb73a622587778e17 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 12:07:10 +0200 Subject: [PATCH 02/20] Rebuilt for Python 3.14 From 79bdb19e780c9e0ccbbe961403ef349116cbc24e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 1 Jun 2025 21:22:19 -0600 Subject: [PATCH 03/20] Update to 5.0.8 Add upstream patch to fix s390x alignments --- .gitignore | 1 + 13117.patch | 23 ----------------------- 13281.patch | 30 ++++++++++++++++++++++++++++++ openmpi.spec | 11 +++-------- sources | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) delete mode 100644 13117.patch create mode 100644 13281.patch diff --git a/.gitignore b/.gitignore index 98ccb0c..3ca97ee 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-5.0.3.tar.bz2 /openmpi-5.0.5.tar.bz2 /openmpi-5.0.6.tar.bz2 +/openmpi-5.0.8.tar.bz2 diff --git a/13117.patch b/13117.patch deleted file mode 100644 index 0082455..0000000 --- a/13117.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2ea6bfb8d6b32a4a2ddc79dbf1043d0cef8e221c Mon Sep 17 00:00:00 2001 -From: Orion Poplawski -Date: Sat, 1 Mar 2025 14:25:18 -0700 -Subject: [PATCH] Latest Fedora has dropped the arch suffix from the openjdk - directory - ---- - config/ompi_setup_java.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/ompi_setup_java.m4 b/config/ompi_setup_java.m4 -index b0212b230e7..02029b83dd6 100644 ---- a/config/ompi_setup_java.m4 -+++ b/config/ompi_setup_java.m4 -@@ -101,7 +101,7 @@ AC_DEFUN([_OMPI_SETUP_JAVA],[ - if test "$ompi_java_found" = "0"; then - # Various Linux - if test -z "$JAVA_HOME"; then -- ompi_java_dir='/usr/lib/jvm/java-*-openjdk-*/include/' -+ ompi_java_dir='/usr/lib/jvm/java-*-openjdk*/include/' - else - ompi_java_dir=$JAVA_HOME/include - fi diff --git a/13281.patch b/13281.patch new file mode 100644 index 0000000..3bcfaf3 --- /dev/null +++ b/13281.patch @@ -0,0 +1,30 @@ +From d5c84ea4595ea1fbb5b213621e0966ebe0fd3cc9 Mon Sep 17 00:00:00 2001 +From: Joseph Schuchart +Date: Wed, 28 May 2025 10:11:58 -0400 +Subject: [PATCH] Force alignment of opal_atomic_int128_t to be 16B + +Some architectures will align 128bit integer on 8B but require 16B alignment +for 128bit CAS instructions and otherwise fall back to a lock-based +atomicity model. By forcing 16bit alignment we can ensure that the variables +are properly aligned and the fall-back is not triggered. + +Thanks to Ulrich Weigand for the analysis and proposed fix in https://github.com/open-mpi/ompi/issues/10988#issuecomment-2913388506. + +Signed-off-by: Joseph Schuchart +--- + opal/include/opal_stdatomic.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/opal/include/opal_stdatomic.h b/opal/include/opal_stdatomic.h +index 35437551208..f7dd8353d3b 100644 +--- a/opal/include/opal_stdatomic.h ++++ b/opal/include/opal_stdatomic.h +@@ -72,7 +72,7 @@ typedef _Atomic opal_int128_t opal_atomic_int128_t; + + # else + +-typedef volatile opal_int128_t opal_atomic_int128_t; ++typedef volatile opal_int128_t opal_atomic_int128_t __opal_attribute_aligned__(16); + + # endif + diff --git a/openmpi.spec b/openmpi.spec index 5e71ec4..5eb1b98 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -54,10 +54,10 @@ %bcond_without pmix # Run autogen - needed for some patches -%bcond autogen 1 +%bcond autogen 0 Name: openmpi%{?_cc_name_suffix} -Version: 5.0.6 +Version: 5.0.8 Release: %autorelease Summary: Open Message Passing Interface # Automatically converted from old format: BSD and MIT and Romio - review is highly recommended. @@ -72,8 +72,7 @@ Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 Source4: macros.openmpi -# Fix JAVA_HOME search -Patch: https://github.com/open-mpi/ompi/pull/13117.patch +Patch0: https://github.com/open-mpi/ompi/pull/13281.patch BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -330,10 +329,6 @@ install -pDm0644 %{SOURCE3} %{buildroot}/%{python3_sitearch}/openmpi.pth %check fail=1 -# Failing on s390x - https://github.com/open-mpi/ompi/issues/10988 -%ifarch s390x -fail=0 -%endif make check || ( cat test/*/test-suite.log && exit $fail ) %files diff --git a/sources b/sources index 435b836..1083caf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-5.0.6.tar.bz2) = 097f7bb18d506b362f16d46df308b387e3173068ba8688739db756919453e1fe947c6d8c2e098481617d8c6bbecb8990002db42f284b1732a80ef3edaaa29f20 +SHA512 (openmpi-5.0.8.tar.bz2) = de9128edaa1886f90f1452b8cee3c3962d7666beed96d7b95c601278c2debc7d7efecc9403792d428ce12131ce30416d6bc6bb657fb1a5490f53c6b6e369b080 From 792dbe38f0f838cc9b71d87db9ca0430cafb24e3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 6 Jun 2025 09:33:57 +0200 Subject: [PATCH 04/20] Rebuilt for Python 3.14 From 7c735869e698da775e4c86e1e18b616b73e4c51c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:37:33 +0000 Subject: [PATCH 05/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cf679b9c3377120a7fb3df62b273ca8ffdcfe855 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:52:30 +0200 Subject: [PATCH 06/20] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- openmpi.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 5eb1b98..8ce1041 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -97,7 +97,7 @@ BuildRequires: hwloc-devel # So configure can find lstopo BuildRequires: hwloc-gui %if %{with java} -BuildRequires: java-devel +BuildRequires: java-25-devel %else Obsoletes: %{name}-java < %{version}-%{release} Obsoletes: %{name}-java-devel < %{version}-%{release} @@ -190,7 +190,7 @@ HTML documentation for openmpi. %package java Summary: Java library Requires: %{name} = %{version}-%{release} -Requires: java-headless +Requires: java-25-headless %description java Java library. @@ -198,7 +198,7 @@ Java library. %package java-devel Summary: Java development files for openmpi Requires: %{name}-java = %{version}-%{release} -Requires: java-devel +Requires: java-25-devel %description java-devel Contains development wrapper for compiling Java with openmpi. From dbd8fb83f5baa2527c5f48e1e2622ff3537ceacd Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 31 Jul 2025 07:34:01 -0600 Subject: [PATCH 07/20] Drop old python2 support --- openmpi.module.in | 2 -- openmpi.pth.py2 | 1 - openmpi.spec | 33 --------------------------------- 3 files changed, 36 deletions(-) delete mode 100644 openmpi.pth.py2 diff --git a/openmpi.module.in b/openmpi.module.in index cdd31b9..71cdbc3 100644 --- a/openmpi.module.in +++ b/openmpi.module.in @@ -14,8 +14,6 @@ setenv MPI_FORTRAN_MOD_DIR @FMODDIR@ setenv MPI_INCLUDE @INCDIR@ setenv MPI_LIB @LIBDIR@/lib setenv MPI_MAN @MANDIR@ -setenv MPI_PYTHON_SITEARCH @PY2SITEARCH@ -setenv MPI_PYTHON2_SITEARCH @PY2SITEARCH@ setenv MPI_PYTHON3_SITEARCH @PY3SITEARCH@ setenv MPI_COMPILER @COMPILER@ setenv MPI_SUFFIX @SUFFIX@ diff --git a/openmpi.pth.py2 b/openmpi.pth.py2 deleted file mode 100644 index a2dc353..0000000 --- a/openmpi.pth.py2 +++ /dev/null @@ -1 +0,0 @@ -import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s)) diff --git a/openmpi.spec b/openmpi.spec index 8ce1041..a2cef26 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -5,12 +5,6 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 -%bcond_with python2 -%else -%bcond_without python2 -%endif - %ifarch aarch64 ppc64le x86_64 %bcond_without ucx %else @@ -68,7 +62,6 @@ ExcludeArch: %{ix86} # We can't use %%{name} here because of _cc_name_suffix Source0: https://www.open-mpi.org/software/ompi/v5.0/downloads/openmpi-%{version}.tar.bz2 Source1: openmpi.module.in -Source2: openmpi.pth.py2 Source3: openmpi.pth.py3 Source4: macros.openmpi @@ -208,17 +201,6 @@ Contains development wrapper for compiling Java with openmpi. # particular package, version, compiler %global namearch openmpi-%{_arch}%{?_cc_name_suffix} -%if %{with python2} -%package -n python2-openmpi -Summary: OpenMPI support for Python 2 -BuildRequires: python2-devel -Requires: %{name} = %{version}-%{release} -Requires: python(abi) = %{python2_version} - -%description -n python2-openmpi -OpenMPI support for Python 2. -%endif - %package -n python%{python3_pkgversion}-openmpi Summary: OpenMPI support for Python 3 Requires: %{name} = %{version}-%{release} @@ -280,11 +262,6 @@ sed 's#@LIBDIR@#%{_libdir}/%{name}#; s#@FMODDIR@#%{_fmoddir}/%{name}#; s#@INCDIR@#%{_includedir}/%{namearch}#; s#@MANDIR@#%{_mandir}/%{namearch}#; -%if %{with python2} - s#@PY2SITEARCH@#%{python2_sitearch}/%{name}#; -%else - /@PY2SITEARCH@/d; -%endif s#@PY3SITEARCH@#%{python3_sitearch}/%{name}#; s#@COMPILER@#openmpi-%{_arch}%{?_cc_name_suffix}#; s#@SUFFIX@#%{?_cc_name_suffix}_openmpi#' \ @@ -320,10 +297,6 @@ sed -i -e s/-ldl// -e s/-lhwloc// \ %{buildroot}%{_libdir}/%{name}/share/openmpi/*-wrapper-data.txt # install .pth files -%if %{with python2} -mkdir -p %{buildroot}/%{python2_sitearch}/%{name} -install -pDm0644 %{SOURCE2} %{buildroot}/%{python2_sitearch}/openmpi.pth -%endif mkdir -p %{buildroot}/%{python3_sitearch}/%{name} install -pDm0644 %{SOURCE3} %{buildroot}/%{python3_sitearch}/openmpi.pth @@ -431,12 +404,6 @@ make check || ( cat test/*/test-suite.log && exit $fail ) %{_mandir}/%{namearch}/man1/mpijavac.1.gz %endif -%if %{with python2} -%files -n python2-openmpi -%dir %{python2_sitearch}/%{name} -%{python2_sitearch}/openmpi.pth -%endif - %files -n python%{python3_pkgversion}-openmpi %dir %{python3_sitearch}/%{name} %{python3_sitearch}/openmpi.pth From a46a18a27fb99f82e00b811d236e3982096f0c32 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 31 Jul 2025 07:35:59 -0600 Subject: [PATCH 08/20] Disable ucx on ppx64le because it is broken - https://github.com/openucx/ucx/issues/10780 --- openmpi.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index a2cef26..d5f879b 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -5,7 +5,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -%ifarch aarch64 ppc64le x86_64 +# ucx on ppc64le/power10 is broken https://github.com/openucx/ucx/issues/10780 +%ifarch aarch64 x86_64 %bcond_without ucx %else %bcond_with ucx From 03257e2bed2f2634e3711779083864eac8740383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 21 Oct 2025 12:49:29 +0200 Subject: [PATCH 09/20] Rebuild for orangefs 2.10.1 From 2811785c6e4e954164cf59de83bbd0d5e172ac15 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 31 Oct 2025 07:47:05 -0600 Subject: [PATCH 10/20] Update to 5.0.9 --- .gitignore | 1 + 13281.patch | 30 ------------------------------ openmpi.spec | 4 +--- sources | 2 +- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 13281.patch diff --git a/.gitignore b/.gitignore index 3ca97ee..c18a70a 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-5.0.5.tar.bz2 /openmpi-5.0.6.tar.bz2 /openmpi-5.0.8.tar.bz2 +/openmpi-5.0.9.tar.bz2 diff --git a/13281.patch b/13281.patch deleted file mode 100644 index 3bcfaf3..0000000 --- a/13281.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d5c84ea4595ea1fbb5b213621e0966ebe0fd3cc9 Mon Sep 17 00:00:00 2001 -From: Joseph Schuchart -Date: Wed, 28 May 2025 10:11:58 -0400 -Subject: [PATCH] Force alignment of opal_atomic_int128_t to be 16B - -Some architectures will align 128bit integer on 8B but require 16B alignment -for 128bit CAS instructions and otherwise fall back to a lock-based -atomicity model. By forcing 16bit alignment we can ensure that the variables -are properly aligned and the fall-back is not triggered. - -Thanks to Ulrich Weigand for the analysis and proposed fix in https://github.com/open-mpi/ompi/issues/10988#issuecomment-2913388506. - -Signed-off-by: Joseph Schuchart ---- - opal/include/opal_stdatomic.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/opal/include/opal_stdatomic.h b/opal/include/opal_stdatomic.h -index 35437551208..f7dd8353d3b 100644 ---- a/opal/include/opal_stdatomic.h -+++ b/opal/include/opal_stdatomic.h -@@ -72,7 +72,7 @@ typedef _Atomic opal_int128_t opal_atomic_int128_t; - - # else - --typedef volatile opal_int128_t opal_atomic_int128_t; -+typedef volatile opal_int128_t opal_atomic_int128_t __opal_attribute_aligned__(16); - - # endif - diff --git a/openmpi.spec b/openmpi.spec index d5f879b..eb7f409 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -52,7 +52,7 @@ %bcond autogen 0 Name: openmpi%{?_cc_name_suffix} -Version: 5.0.8 +Version: 5.0.9 Release: %autorelease Summary: Open Message Passing Interface # Automatically converted from old format: BSD and MIT and Romio - review is highly recommended. @@ -66,8 +66,6 @@ Source1: openmpi.module.in Source3: openmpi.pth.py3 Source4: macros.openmpi -Patch0: https://github.com/open-mpi/ompi/pull/13281.patch - BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: make diff --git a/sources b/sources index 1083caf..4af497e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-5.0.8.tar.bz2) = de9128edaa1886f90f1452b8cee3c3962d7666beed96d7b95c601278c2debc7d7efecc9403792d428ce12131ce30416d6bc6bb657fb1a5490f53c6b6e369b080 +SHA512 (openmpi-5.0.9.tar.bz2) = d7f700d6f412c6ff6d2f0d71da6dff9c88039e4c0693ff4f68c9cf4e9705744c362ac7afa916c7d7c6389832a1c8b4681b567a8521df3abdab22c581157cc5d0 From 0f5839e45810f28682bdd5d38a104d27b15387c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 22:58:03 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From fc3843f7f12b1c475939a0cdf886a0c15ec6369e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Jan 2026 08:55:30 +0100 Subject: [PATCH 12/20] migrate license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- openmpi.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index eb7f409..ea0807d 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -56,7 +56,15 @@ Version: 5.0.9 Release: %autorelease Summary: Open Message Passing Interface # Automatically converted from old format: BSD and MIT and Romio - review is highly recommended. -License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT AND LicenseRef-Romio +# main code is BSD-3-Clause-Open-MPI +# 3rd-party/romio341 is mpich2 +# 3rd-party/treematch is BSD-3-Clause +# oshmem/mca/memheap/ptmalloc/malloc.c is LicenseRef-Fedora-Public-Domain +# opal/util/qsort.c is BSD-4-Clause-UC +# java/ (in subpackage) is Apache-2.0 +# 3rd-party/openpmix/src/mca/psec/munge/psec_munge.c is LGPL-2.0-or-later +# doc/ see bellow in subpackage +License: BSD-3-Clause-Open-MPI AND mpich2 AND BSD-3-Clause AND LicenseRef-Fedora-Public-Domain AND BSD-4-Clause-UC URL: http://www.open-mpi.org/ ExcludeArch: %{ix86} @@ -173,6 +181,7 @@ Contains development headers and libraries for openmpi. %package doc Summary: HTML documentation for openmpi +License: BSD-3-Clause AND BSD-3-Clause-Open-MPI AND mpich2 AND MIT AND (MIT OR GPL-2.0-or-later) AND (OFL-1.1 AND MIT) BuildArch: noarch %description doc @@ -181,6 +190,7 @@ HTML documentation for openmpi. %if %{with java} %package java Summary: Java library +License: Apache-2.0 Requires: %{name} = %{version}-%{release} Requires: java-25-headless @@ -189,6 +199,7 @@ Java library. %package java-devel Summary: Java development files for openmpi +License: Apache-2.0 Requires: %{name}-java = %{version}-%{release} Requires: java-25-devel From ddbbcc8a9cf0392f91f018d527cc0f9045153d71 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 5 Mar 2026 08:52:20 -0700 Subject: [PATCH 13/20] Add patches to fix building with gcc 16 (FTBFS rhbz#2434889) --- openmpi-braces.patch | 16 ++++++++++++++++ openmpi-inline.patch | 13 +++++++++++++ openmpi.spec | 4 ++++ 3 files changed, 33 insertions(+) create mode 100644 openmpi-braces.patch create mode 100644 openmpi-inline.patch diff --git a/openmpi-braces.patch b/openmpi-braces.patch new file mode 100644 index 0000000..61b3c59 --- /dev/null +++ b/openmpi-braces.patch @@ -0,0 +1,16 @@ +diff --git a/oshmem/mca/memheap/base/memheap_base_frame.c b/oshmem/mca/memheap/base/memheap_base_frame.c +index 53a71b27a9..82658e0979 100644 +--- a/oshmem/mca/memheap/base/memheap_base_frame.c ++++ b/oshmem/mca/memheap/base/memheap_base_frame.c +@@ -33,9 +33,9 @@ + + int mca_memheap_base_output = -1; + int mca_memheap_base_key_exchange = 1; +-opal_list_t mca_memheap_base_components_opened = {{0}}; ++opal_list_t mca_memheap_base_components_opened = {}; + int mca_memheap_base_already_opened = 0; +-mca_memheap_map_t mca_memheap_base_map = {{{{0}}}}; ++mca_memheap_map_t mca_memheap_base_map = {}; + int mca_memheap_num_segments_warn = 32; + + static int mca_memheap_base_register(mca_base_register_flag_t flags) diff --git a/openmpi-inline.patch b/openmpi-inline.patch new file mode 100644 index 0000000..dd901e8 --- /dev/null +++ b/openmpi-inline.patch @@ -0,0 +1,13 @@ +diff --git a/ompi/mca/part/persist/part_persist.h b/ompi/mca/part/persist/part_persist.h +index ccc8f8f197..86fb9bac42 100644 +--- a/ompi/mca/part/persist/part_persist.h ++++ b/ompi/mca/part/persist/part_persist.h +@@ -490,7 +490,7 @@ mca_part_persist_psend_init(const void* buf, + return err; + } + +-__opal_attribute_always_inline__ static inline int ++static inline int + mca_part_persist_start(size_t count, ompi_request_t** requests) + { + int err = OMPI_SUCCESS; diff --git a/openmpi.spec b/openmpi.spec index ea0807d..ac8b67d 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -73,6 +73,10 @@ Source0: https://www.open-mpi.org/software/ompi/v5.0/downloads/openmpi-%{ Source1: openmpi.module.in Source3: openmpi.pth.py3 Source4: macros.openmpi +# Fix always inline failure - https://github.com/open-mpi/ompi/pull/13756 +Patch: openmpi-inline.patch +# Fix brace initialization - https://github.com/open-mpi/ompi/pull/13758 +Patch: openmpi-braces.patch BuildRequires: gcc-c++ BuildRequires: gcc-gfortran From 44268f7cc876ad3218425ca66d4ba701d1b2acb0 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 21 Feb 2026 11:47:53 -0700 Subject: [PATCH 14/20] Cleanup old rpm conditionals --- openmpi.spec | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index ac8b67d..0b6d632 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -107,9 +107,7 @@ Obsoletes: %{name}-java < %{version}-%{release} Obsoletes: %{name}-java-devel < %{version}-%{release} %endif # Old libevent causes issues -%if !0%{?el7} BuildRequires: libevent-devel -%endif BuildRequires: libfabric-devel %ifnarch s390x BuildRequires: papi-devel @@ -134,9 +132,7 @@ BuildRequires: libpsm2-devel BuildRequires: ucx-devel %endif BuildRequires: zlib-devel -%if !0%{?el7} BuildRequires: rpm-mpi-hooks -%endif %if %{with sphinx} # For docs BuildRequires: /usr/bin/sphinx-build @@ -145,10 +141,6 @@ BuildRequires: python3-sphinx_rtd_theme %endif Provides: mpi -%if 0%{?rhel} == 7 -# Need this for /etc/profile.d/modules.sh -Requires: environment-modules -%endif Requires: environment(modules) Requires: prrte # openmpi currently requires ssh to run @@ -172,13 +164,11 @@ researchers. For more information, see http://www.open-mpi.org/ . Summary: Development files for openmpi Requires: %{name} = %{version}-%{release}, gcc-gfortran Provides: mpi-devel -%if !0%{?el7} Requires: rpm-mpi-hooks # Make sure this package is rebuilt with correct Python version when updating # Otherwise mpi.req from rpm-mpi-hooks doesn't work # https://bugzilla.redhat.com/show_bug.cgi?id=1705296 Requires: (python(abi) = %{python3_version} if python3) -%endif %description devel Contains development headers and libraries for openmpi. @@ -254,12 +244,10 @@ OpenMPI support for Python 3. --enable-memchecker \ %endif --with-hwloc=/usr \ -%if !0%{?el7} --with-libevent=external \ %if %{with pmix} --with-pmix=external \ %endif -%endif %make_build V=1 @@ -354,9 +342,6 @@ make check || ( cat test/*/test-suite.log && exit $fail ) %{_mandir}/%{namearch}/man7/Open-MPI.7* %{_libdir}/%{name}/lib/*.so.40* %{_libdir}/%{name}/lib/*.so.80* -%if 0%{?el7} -%{_libdir}/%{name}/lib/pmix/ -%endif %{_mandir}/%{namearch}/man1/mpirun.1* %{_mandir}/%{namearch}/man1/mpisync.1* %{_mandir}/%{namearch}/man1/ompi* @@ -369,9 +354,6 @@ make check || ( cat test/*/test-suite.log && exit $fail ) %dir %{_libdir}/%{name}/share/openmpi %{_libdir}/%{name}/share/openmpi/amca-param-sets %{_libdir}/%{name}/share/openmpi/help*.txt -%if 0%{?el7} -%{_libdir}/%{name}/share/pmix/ -%endif %files devel %dir %{_includedir}/%{namearch} From b7ffd3ae60c61766e3f2444b94e7eb04009ab960 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 6 Mar 2026 19:22:46 -0700 Subject: [PATCH 15/20] Update to 5.0.10 --- .gitignore | 1 + openmpi.spec | 3 +-- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c18a70a..d89aa68 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ openmpi-1.4.1-RH.tar.bz2 /openmpi-5.0.6.tar.bz2 /openmpi-5.0.8.tar.bz2 /openmpi-5.0.9.tar.bz2 +/openmpi-5.0.10.tar.bz2 diff --git a/openmpi.spec b/openmpi.spec index 0b6d632..56f1d56 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -52,7 +52,7 @@ %bcond autogen 0 Name: openmpi%{?_cc_name_suffix} -Version: 5.0.9 +Version: 5.0.10 Release: %autorelease Summary: Open Message Passing Interface # Automatically converted from old format: BSD and MIT and Romio - review is highly recommended. @@ -313,7 +313,6 @@ make check || ( cat test/*/test-suite.log && exit $fail ) %dir %{_libdir}/%{name}/bin %dir %{_libdir}/%{name}/lib %dir %{_libdir}/%{name}/lib/openmpi -%dir %{_libdir}/%{name}/lib/openmpi/cmake %dir %{_libdir}/%{name}/include %dir %{_mandir}/%{namearch} %dir %{_mandir}/%{namearch}/man* diff --git a/sources b/sources index 4af497e..34f655a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmpi-5.0.9.tar.bz2) = d7f700d6f412c6ff6d2f0d71da6dff9c88039e4c0693ff4f68c9cf4e9705744c362ac7afa916c7d7c6389832a1c8b4681b567a8521df3abdab22c581157cc5d0 +SHA512 (openmpi-5.0.10.tar.bz2) = 24d29c2e88549e5a59f47dac0a2327db99644c59fd2991441d0ec23edb95aa7328fcd67bd44601ce9f11b0af90d36fddf82643e23f0f6e7c013c99f9bbd9738e From 107d2a8e740a4388f9ff5408c27be9e40603009d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 23:34:26 +0200 Subject: [PATCH 16/20] Rebuilt for Python 3.15 From 79e515a9bf35e6d41105bce95855cddef2a15b2c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 5 Jun 2026 22:07:40 -0600 Subject: [PATCH 17/20] Drop unused BuildRequires. [skip changelog] --- openmpi.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 56f1d56..efcd4a9 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -12,13 +12,7 @@ %bcond_with ucx %endif -# ARM 32-bit is not supported by rdma -# https://bugzilla.redhat.com/show_bug.cgi?id=1780584 -%ifarch %{arm} -%bcond_with rdma -%else %bcond_without rdma -%endif # No more Java on i686 %ifarch %{java_arches} @@ -90,7 +84,6 @@ BuildRequires: perl(File::Find) BuildRequires: valgrind-devel %endif %if %{with rdma} -BuildRequires: opensm-devel > 3.3.0 BuildRequires: rdma-core-devel %endif # Doesn't compile: @@ -98,8 +91,6 @@ BuildRequires: rdma-core-devel # loop->getLoopHead()->getStartAddress(), loop_stmts ); #BuildRequires: dyninst-devel BuildRequires: hwloc-devel -# So configure can find lstopo -BuildRequires: hwloc-gui %if %{with java} BuildRequires: java-25-devel %else @@ -121,8 +112,6 @@ BuildRequires: perl(Getopt::Long) %if %{with pmix} BuildRequires: pmix-devel >= 4.2.7 %endif -# For configure to find /usr/bin/prte -BuildRequires: prrte BuildRequires: prrte-devel BuildRequires: python%{python3_pkgversion}-devel %if %{with psm2} From e3e1783aa51a9010acaaddb72f4da229b2b6cdb7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 10:28:49 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 32751bdeb8bc6afa610f6a3a42187a9421f141da Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:56:02 +0200 Subject: [PATCH 19/20] Rebuilt for Python 3.15.0b4 ABI change From d46d1d9b6180eed7e96c07be60e6c55d532b588f Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Mon, 27 Jul 2026 16:06:23 +0200 Subject: [PATCH 20/20] Drop unused recommonmark Signed-off-by: Cristian Le --- openmpi-drop-recommonmark.patch | 31 +++++++++++++++++++++++++++++++ openmpi.spec | 5 +++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 openmpi-drop-recommonmark.patch diff --git a/openmpi-drop-recommonmark.patch b/openmpi-drop-recommonmark.patch new file mode 100644 index 0000000..9ee88a1 --- /dev/null +++ b/openmpi-drop-recommonmark.patch @@ -0,0 +1,31 @@ +diff -ru openmpi-5.0.10/config/oac/oac_setup_sphinx.m4 openmpi-5.0.10-new/config/oac/oac_setup_sphinx.m4 +--- openmpi-5.0.10/config/oac/oac_setup_sphinx.m4 2026-02-23 21:21:40.731399193 +0100 ++++ openmpi-5.0.10-new/config/oac/oac_setup_sphinx.m4 2026-07-27 17:10:12.450825327 +0200 +@@ -115,7 +115,7 @@ + author = 'Testing' + import sphinx_rtd_theme + # Note the extra quoting needed for square brackets because this is m4 +-extensions = [[ 'recommonmark', 'sphinx_rtd_theme', 'sphinx.ext.extlinks' ]] ++extensions = [[ 'sphinx_rtd_theme', 'sphinx.ext.extlinks' ]] + html_theme = 'sphinx_rtd_theme' + EOF + echo "Hello world" > index.rst +diff -ru openmpi-5.0.10/docs/conf.py openmpi-5.0.10-new/docs/conf.py +--- openmpi-5.0.10/docs/conf.py 2026-02-23 21:21:10.775279351 +0100 ++++ openmpi-5.0.10-new/docs/conf.py 2026-07-27 17:10:34.017830912 +0200 +@@ -174,7 +174,6 @@ + # ones. + import sphinx_rtd_theme + extensions = [ +- 'recommonmark', + "sphinx_rtd_theme", + "sphinx.ext.extlinks", + ] +diff -ru openmpi-5.0.10/docs/requirements.txt openmpi-5.0.10-new/docs/requirements.txt +--- openmpi-5.0.10/docs/requirements.txt 2026-02-23 21:21:10.811279501 +0100 ++++ openmpi-5.0.10-new/docs/requirements.txt 2026-07-27 17:10:43.482113314 +0200 +@@ -1,4 +1,3 @@ + sphinx>=4.2.0 +-recommonmark + docutils + sphinx-rtd-theme diff --git a/openmpi.spec b/openmpi.spec index efcd4a9..c0ecb85 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -43,7 +43,7 @@ %bcond_without pmix # Run autogen - needed for some patches -%bcond autogen 0 +%bcond autogen 1 Name: openmpi%{?_cc_name_suffix} Version: 5.0.10 @@ -71,6 +71,8 @@ Source4: macros.openmpi Patch: openmpi-inline.patch # Fix brace initialization - https://github.com/open-mpi/ompi/pull/13758 Patch: openmpi-braces.patch +# Drop unused recommonmark - https://github.com/open-mpi/ompi/pull/14215 +Patch: openmpi-drop-recommonmark.patch BuildRequires: gcc-c++ BuildRequires: gcc-gfortran @@ -125,7 +127,6 @@ BuildRequires: rpm-mpi-hooks %if %{with sphinx} # For docs BuildRequires: /usr/bin/sphinx-build -BuildRequires: python3-recommonmark BuildRequires: python3-sphinx_rtd_theme %endif