Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d46d1d9b61 | ||
|
|
32751bdeb8 | ||
|
|
e3e1783aa5 | ||
|
|
79e515a9bf | ||
|
|
107d2a8e74 | ||
|
|
b7ffd3ae60 | ||
|
|
44268f7cc8 |
4 changed files with 37 additions and 34 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -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
|
||||
|
|
|
|||
31
openmpi-drop-recommonmark.patch
Normal file
31
openmpi-drop-recommonmark.patch
Normal file
|
|
@ -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
|
||||
37
openmpi.spec
37
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}
|
||||
|
|
@ -49,10 +43,10 @@
|
|||
%bcond_without pmix
|
||||
|
||||
# Run autogen - needed for some patches
|
||||
%bcond autogen 0
|
||||
%bcond autogen 1
|
||||
|
||||
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.
|
||||
|
|
@ -77,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
|
||||
|
|
@ -90,7 +86,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 +93,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
|
||||
|
|
@ -107,9 +100,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
|
||||
|
|
@ -123,8 +114,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}
|
||||
|
|
@ -134,21 +123,14 @@ 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
|
||||
BuildRequires: python3-recommonmark
|
||||
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 +154,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 +234,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
|
||||
|
||||
|
|
@ -325,7 +303,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*
|
||||
|
|
@ -354,9 +331,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 +343,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}
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (openmpi-5.0.9.tar.bz2) = d7f700d6f412c6ff6d2f0d71da6dff9c88039e4c0693ff4f68c9cf4e9705744c362ac7afa916c7d7c6389832a1c8b4681b567a8521df3abdab22c581157cc5d0
|
||||
SHA512 (openmpi-5.0.10.tar.bz2) = 24d29c2e88549e5a59f47dac0a2327db99644c59fd2991441d0ec23edb95aa7328fcd67bd44601ce9f11b0af90d36fddf82643e23f0f6e7c013c99f9bbd9738e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue