!68 Modify multicore timeout error

From: @swag-zhang-zi-jian 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek

0001-modify-multicore-timeout-support.patch

@@ -0,0 +1,25 @@
+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
+

openmpi.spec

@@ -1,13 +1,14 @@
 Name:           openmpi
-Version:        2.1.1
-Release:        20
+Version:        4.1.4
+Release:        5
 Summary:        Open Source High Performance Computing
-License:        BSD and MIT and Romio
+License:        BSD-3-Clause
 URL:            http://www.open-mpi.org/
-Source0:        https://download.open-mpi.org/release/open-mpi/v2.1/openmpi-%{version}.tar.bz2
+Source0:        https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-%{version}.tar.bz2
 Source1:        openmpi.module.in
 Source2:        openmpi.pth.py3
 Source3:        macros.openmpi
+Patch1000:      0001-modify-multicore-timeout-support.patch
 
 BuildRequires:      gcc-c++, gcc-gfortran
 BuildRequires:      valgrind-devel, hwloc-devel, java-devel, libfabric-devel, papi-devel
@@ -15,7 +16,7 @@ BuildRequires:      libibverbs-devel >= 1.1.3, opensm-devel > 3.3.0
 BuildRequires:      librdmacm-devel, rdma-core-devel, pmix-devel
 BuildRequires:      hwloc-gui chrpath
 BuildRequires:      perl-generators, perl(Getopt::Long)
-BuildRequires:      python3-devel
+BuildRequires:      python3-devel libevent-devel
 %ifarch x86_64
 BuildRequires:      infinipath-psm-devel, libpsm2-devel zlib-devel
 %endif
@@ -36,6 +37,8 @@ community in order to build the best MPI library available.
 
 %ifarch aarch64
 %global name_all openmpi-aarch64
+%elifarch ppc64le
+%global name_all openmpi-ppc64le
 %else
 %global name_all openmpi-x86_64
 %endif
@@ -70,7 +73,11 @@ This contains man files for the using of openmpi.
 %autosetup -n openmpi-%{version} -p1
 
 %build
-./configure --prefix=%{_libdir}/%{name} \
+./configure \
+            --bindir=%{_bindir} \
+            --libdir=%{_libdir}/%{name}/lib \
+            --datadir=%{_libdir}/%{name}/share \
+            --docdir=%{_libdir}/%{name}/share/doc/openmpi \
             --includedir=%{_includedir}/%{name_all} \
             --sysconfdir=%{_sysconfdir}/%{name_all} \
             --disable-silent-rules \
@@ -82,6 +89,8 @@ This contains man files for the using of openmpi.
             --with-sge \
             --with-valgrind \
             --with-hwloc=/usr \
+            --with-pmix=external \
+            --with-libevent=external \
             --mandir=%{_mandir}/%{name_all} \
             CFLAGS="$RPM_OPT_FLAGS" \
             CXXFLAGS="$RPM_OPT_FLAGS" \
@@ -153,7 +162,6 @@ make check
 %license LICENSE opal/mca/event/libevent2022/libevent/LICENSE
 %dir %{_libdir}/%{name}
 %dir %{_sysconfdir}/%{name_all}
-%dir %{_libdir}/%{name}/bin
 %dir %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/lib/openmpi
 %dir %{_mandir}/%{name_all}
@@ -163,15 +171,12 @@ make check
 %config(noreplace) %{_sysconfdir}/%{name_all}/*
 %config(noreplace) /etc/ld.so.conf.d/*
 %{_datadir}/modulefiles/mpi/
-%{_libdir}/%{name}/bin/mpiexec
-%{_libdir}/%{name}/bin/mpirun
-%{_libdir}/%{name}/bin/ompi*
-%{_libdir}/%{name}/bin/orte-*
-%{_libdir}/%{name}/bin/orted
-%{_libdir}/%{name}/bin/orterun
-%{_libdir}/%{name}/bin/oshmem_info
-%{_libdir}/%{name}/bin/oshrun
-%{_libdir}/%{name}/bin/shmemrun
+%{_bindir}/mpiexec
+%{_bindir}/mpirun
+%{_bindir}/ompi*
+%{_bindir}/orte-*
+%{_bindir}/orted
+%{_bindir}/orterun
 %{_libdir}/%{name}/lib/*.so.*
 %{_libdir}/%{name}/lib/openmpi/*
 %{_libdir}/%{name}/lib/mpi.jar
@@ -184,16 +189,14 @@ make check
 %dir %{_includedir}/%{name_all}
 %{_includedir}/%{name_all}/*
 %{_libdir}/%{name}/share/doc/
-%{_libdir}/%{name}/bin/mpic*
-%{_libdir}/%{name}/bin/mpiCC
-%{_libdir}/%{name}/bin/mpif*
-%{_libdir}/%{name}/bin/opal*
-%{_libdir}/%{name}/bin/ortecc
-%{_libdir}/%{name}/bin/oshcc
-%{_libdir}/%{name}/bin/oshfort
-%{_libdir}/%{name}/bin/shmemcc
-%{_libdir}/%{name}/bin/shmemfort
-%{_libdir}/%{name}/bin/mpijava*
+%{_bindir}/mpic*
+%{_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
 %{_libdir}/%{name}/lib/pkgconfig/
@@ -211,6 +214,21 @@ make check
 %{_mandir}/%{name_all}/man*/*
 
 %changelog
+* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5
+- Modify multicore caused finalize timeout error
+
+* Thu Feb 1 2024 peng.zou <peng.zou@shingroup.cn> - 4.1.4-4
+- Add ppc64le support
+
+* Wed Aug 16 2023 wulei <wu_lei@hoperun.com> - 4.1.4-3
+- Modify the /usr/lib64/openmpi/bin path to /usr/bin
+
+* Fri Jul 29 2022 wangkai <wangkai385@h-partners.com> - 4.1.4-2
+- Reslove conflict with pmix-devel and update license
+
+* Mon Jun 20 2022 wulei <wulei80@h-partners.com> - 4.1.4-1
+- Upgrade to 4.1.1
+
 * Thu Sep 9 2021 Pengju Jiang <jiangpengju2@huawei.com> - 2.1.1-20
 - solve the strip and rpath problem of safe conversion