From a4e930e78a5e72796df89696022a684e61946978 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Thu, 15 Aug 2024 19:48:22 +0800 Subject: [PATCH 1/6] Modify multicore caused timeout error --- 0002-modify-multicore-timeout-support.patch | 13 +++++++++++++ openmpi.spec | 7 ++++++- 2 files changed, 19 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..0e5e18c --- /dev/null +++ b/0002-modify-multicore-timeout-support.patch @@ -0,0 +1,13 @@ +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; + diff --git a/openmpi.spec b/openmpi.spec index 37726ad..535ea77 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,10 @@ make check %{_mandir}/%{name_all}/man*/* %changelog + +* Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.6-7 +- Modify multicore causing finalize timeout error + * Fri Jun 07 2024 wangqiang - 4.1.5-6 - Fix name_all -- Gitee From 7660237980ec2b84b6a3b65f61b82ce5881a9bee Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Fri, 16 Aug 2024 16:40:28 +0800 Subject: [PATCH 2/6] gai --- openmpi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index 535ea77..634b13e 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -235,7 +235,7 @@ make check %changelog -* Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.6-7 +* Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.5-7 - Modify multicore causing finalize timeout error * Fri Jun 07 2024 wangqiang - 4.1.5-6 -- Gitee From 805b1b8a890d6f8b5fa263d23e6c8fe7216dd033 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 10:42:36 +0800 Subject: [PATCH 3/6] version modified --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 634b13e..3d2562a 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.5 -Release: 7 +Release: 8 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -235,7 +235,7 @@ make check %changelog -* Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.5-7 +* Fri Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-8 - Modify multicore causing finalize timeout error * Fri Jun 07 2024 wangqiang - 4.1.5-6 -- Gitee From 7f25a0974a758ccb15e44523dccc41f1b4164363 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 18:15:36 +0800 Subject: [PATCH 4/6] modify date --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 3d2562a..a1b1678 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.5 -Release: 8 +Release: 7 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -235,7 +235,7 @@ make check %changelog -* Fri Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-8 +* 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 -- Gitee From ac8b6241559764037e830c102ba8134cff2105d7 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 18:26:24 +0800 Subject: [PATCH 5/6] new --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index a1b1678..e4cf906 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.5 -Release: 7 +Release: 9 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -235,7 +235,7 @@ make check %changelog -* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-7 +* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-9 - Modify multicore causing finalize timeout error * Fri Jun 07 2024 wangqiang - 4.1.5-6 -- Gitee From 892095662837e033a54dfd586f34f2ce9f688ba3 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 19:15:39 +0800 Subject: [PATCH 6/6] Modify multicore caused timeout error --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 3d2562a..e4cf906 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.5 -Release: 8 +Release: 9 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -235,7 +235,7 @@ make check %changelog -* Fri Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-8 +* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.5-9 - Modify multicore causing finalize timeout error * Fri Jun 07 2024 wangqiang - 4.1.5-6 -- Gitee