From 20ca0cc0587d84cd65a6ba5707d5fb11957cb6f8 Mon Sep 17 00:00:00 2001 From: ZZJ Date: Sat, 31 Aug 2024 13:48:34 +0800 Subject: [PATCH] modify muliticore timeout error --- 0002-modify-multicore-timeout-support.patch | 25 +++++++++++++++++++++ openmpi.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0002-modify-multicore-timeout-support.patch diff --git a/0002-modify-multicore-timeout-support.patch b/0002-modify-multicore-timeout-support.patch new file mode 100644 index 0000000..a56905b --- /dev/null +++ b/0002-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 + diff --git a/openmpi.spec b/openmpi.spec index 37726ad..7b2d88b 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.5 -Release: 6 +Release: 7 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -12,6 +12,7 @@ Patch1000: add-riscv64-support.patch %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} @@ -233,6 +234,9 @@ make check %{_mandir}/%{name_all}/man*/* %changelog +* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-7 +- Modify multicore causing finalize timeout error + * Fri Jun 07 2024 wangqiang - 4.1.5-6 - Fix name_all -- Gitee