diff --git a/0002-modify-multicore-timeout-support.patch b/0002-modify-multicore-timeout-support.patch deleted file mode 100644 index a56905bf1f08b90b178476fb1f2e51b88e0b3e06..0000000000000000000000000000000000000000 --- a/0002-modify-multicore-timeout-support.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 381138de2ec31950eae0f216ab452e1d37b700cc Mon Sep 17 00:00:00 2001 -From: ZZJ <1220292247@qq.com> -Date: Sat, 31 Aug 2024 13:40:28 +0800 -Subject: [PATCH] change threshold - ---- - opal/mca/pmix/pmix3x/pmix/src/client/pmix_client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/opal/mca/pmix/pmix3x/pmix/src/client/pmix_client.c b/opal/mca/pmix/pmix3x/pmix/src/client/pmix_client.c -index d012c3a..fcf2f1d 100644 ---- a/opal/mca/pmix/pmix3x/pmix/src/client/pmix_client.c -+++ b/opal/mca/pmix/pmix3x/pmix/src/client/pmix_client.c -@@ -904,7 +904,7 @@ PMIX_EXPORT pmix_status_t PMIx_Finalize(const pmix_info_t info[], size_t ninfo) - pmix_status_t rc; - size_t n; - pmix_client_timeout_t tev; -- struct timeval tv = {2, 0}; -+ struct timeval tv = {5, 0}; - pmix_peer_t *peer; - int i; - --- -2.42.0.windows.2 - diff --git a/openmpi-4.1.5.tar.bz2 b/openmpi-5.0.5.tar.bz2 similarity index 30% rename from openmpi-4.1.5.tar.bz2 rename to openmpi-5.0.5.tar.bz2 index b2b9429bf4f155ef0aaa8714dbe13d51acd5c5f7..bfe0db5562625dc9070b78030eac6618a396f12c 100644 Binary files a/openmpi-4.1.5.tar.bz2 and b/openmpi-5.0.5.tar.bz2 differ diff --git a/openmpi.spec b/openmpi.spec index 7b2d88b6ab8b97417e107f754843bd43a015a780..7834daa6965fea2d306774da04749aff92d0f299 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,18 +1,19 @@ Name: openmpi -Version: 4.1.5 -Release: 7 +Version: 5.0.5 +Release: 1 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ -Source0: https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-%{version}.tar.bz2 +Source0: https://download.open-mpi.org/release/open-mpi/v5.0/openmpi-%{version}.tar.bz2 Source1: openmpi.module.in Source2: openmpi.pth.py3 Source3: macros.openmpi +%ifarch riscv64 Patch1000: add-riscv64-support.patch +%endif %ifarch loongarch64 Patch1001: 0001-add-loongarch64-support-for-openmpi.patch %endif -Patch1002: 0002-modify-multicore-timeout-support.patch BuildRequires: gcc-c++, gcc-gfortran %ifarch %{valgrind_arches} @@ -90,6 +91,7 @@ This contains man files for the using of openmpi. ./autogen.pl --force %build + ./configure \ --bindir=%{_bindir} \ --libdir=%{_libdir}/%{name}/lib \ @@ -100,7 +102,6 @@ This contains man files for the using of openmpi. --disable-silent-rules \ --enable-builtin-atomics \ --enable-mpi-thread-multiple \ - --enable-mpi-cxx \ --enable-mpi-java \ --enable-mpi1-compatibility \ --with-sge \ @@ -124,9 +125,6 @@ This contains man files for the using of openmpi. %make_install find %{buildroot}%{_libdir}/%{name}/lib -name \*.la -delete find %{buildroot}%{_mandir}/%{name_all} -type f -exec gzip -9 {} \; -ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{name_all}/man1/mpiCC.1.gz -rm %{buildroot}%{_mandir}/%{name_all}/man1/mpiCC.1 -mkdir %{buildroot}%{_mandir}/%{name_all}/man{2,4,5,6,8,9,n} mkdir -p %{buildroot}%{_datadir}/modulefiles/mpi sed 's#@LIBDIR@#%{_libdir}/%{name}#; @@ -179,7 +177,7 @@ echo "%{_libdir}/openmpi/lib" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.c make check %files -%license LICENSE opal/mca/event/libevent2022/libevent/LICENSE +%license LICENSE %dir %{_libdir}/%{name} %dir %{_sysconfdir}/%{name_all} %dir %{_libdir}/%{name}/lib @@ -194,15 +192,17 @@ make check %{_bindir}/mpiexec %{_bindir}/mpirun %{_bindir}/ompi* -%{_bindir}/orte-* -%{_bindir}/orted -%{_bindir}/orterun +%{_bindir}/oshrun +%{_bindir}/pcc +%{_bindir}/prte* +%{_bindir}/prun +%{_bindir}/pterm %{_libdir}/%{name}/lib/*.so.* %{_libdir}/%{name}/lib/openmpi/* %{_libdir}/%{name}/lib/mpi.jar %{_libdir}/%{name}/share/openmpi/help*.txt %{_libdir}/%{name}/share/openmpi/amca-param-sets -%{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini +%{_libdir}/%{name}/share/prte/* %files devel @@ -213,9 +213,6 @@ make check %{_bindir}/mpiCC %{_bindir}/mpif* %{_bindir}/opal* -%{_bindir}/ortecc -%{_bindir}/aggregate_profile.pl -%{_bindir}/profile2mat.pl %{_bindir}/mpijava* %{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.mod @@ -234,6 +231,12 @@ make check %{_mandir}/%{name_all}/man*/* %changelog +* Tue Jul 02 2024 xu_ping <707078654@qq.com> - 5.0.5-1 +- Upgrade version to 5.0.5 +- MPI C++ bindings have been removed. +- Add missing write memory barrier in btl/smcuda +- fix some bugs. + * Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-7 - Modify multicore causing finalize timeout error