From dd71906763fb937ba0466e252af6fd01e755d22e Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Fri, 16 Aug 2024 09:08:15 +0800 Subject: [PATCH 1/7] modify finalize timeout error --- 0001-modify-multicore-timeout-support.patch | 13 +++++++++++++ openmpi.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 0001-modify-multicore-timeout-support.patch diff --git a/0001-modify-multicore-timeout-support.patch b/0001-modify-multicore-timeout-support.patch new file mode 100644 index 0000000..0e5e18c --- /dev/null +++ b/0001-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 f8b9b8f..e9f1175 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.4 -Release: 4 +Release: 5 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -8,6 +8,7 @@ Source0: https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-%{ve 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 @@ -213,6 +214,10 @@ make check %{_mandir}/%{name_all}/man*/* %changelog + +* Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5 +- Modify multicore caused finalize timeout error + * Thu Feb 1 2024 peng.zou - 4.1.4-4 - Add ppc64le support -- Gitee From cbdc5a5c1a6627935fc2abb09d606ca09b02fb96 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Fri, 16 Aug 2024 16:41:14 +0800 Subject: [PATCH 2/7] gai --- openmpi.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index e9f1175..c7048db 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -214,7 +214,6 @@ make check %{_mandir}/%{name_all}/man*/* %changelog - * Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5 - Modify multicore caused finalize timeout error -- Gitee From 545b7bdeec8f63c836c6c695e7dedbb1ed66a865 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Fri, 16 Aug 2024 16:47:57 +0800 Subject: [PATCH 3/7] gai --- openmpi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index c7048db..0a5ef13 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -214,7 +214,7 @@ make check %{_mandir}/%{name_all}/man*/* %changelog -* Fri Aug 15 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5 +* Fri Aug 16 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5 - Modify multicore caused finalize timeout error * Thu Feb 1 2024 peng.zou - 4.1.4-4 -- Gitee From 5859c1560f13af9edfb735cf582f5fe4967127ef Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 10:37:09 +0800 Subject: [PATCH 4/7] version modified --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 0a5ef13..5130253 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.4 -Release: 5 +Release: 6 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -214,7 +214,7 @@ make check %{_mandir}/%{name_all}/man*/* %changelog -* Fri Aug 16 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5 +* Fri Aug 16 2024 zhangzijian <1220292247@qq.com> - 4.1.4-6 - Modify multicore caused finalize timeout error * Thu Feb 1 2024 peng.zou - 4.1.4-4 -- Gitee From 724df5e21ef53d894d6721c5594cc7cdf5f2c879 Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 10:44:08 +0800 Subject: [PATCH 5/7] bogus time fix --- openmpi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmpi.spec b/openmpi.spec index 5130253..fa14c38 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -214,7 +214,7 @@ make check %{_mandir}/%{name_all}/man*/* %changelog -* Fri Aug 16 2024 zhangzijian <1220292247@qq.com> - 4.1.4-6 +* Fri Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.4-6 - Modify multicore caused finalize timeout error * Thu Feb 1 2024 peng.zou - 4.1.4-4 -- Gitee From 2fa3b91633868b6910cf17b5780638c75ae6b83b Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 18:46:54 +0800 Subject: [PATCH 6/7] new --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index fa14c38..16045aa 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.4 -Release: 6 +Release: 7 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -214,7 +214,7 @@ make check %{_mandir}/%{name_all}/man*/* %changelog -* Fri Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.4-6 +* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.4-7 - Modify multicore caused finalize timeout error * Thu Feb 1 2024 peng.zou - 4.1.4-4 -- Gitee From 7660296a98cb421377e621add061c6167abe5e4c Mon Sep 17 00:00:00 2001 From: ZZJ <1220292247@qq.com> Date: Mon, 19 Aug 2024 11:20:49 +0000 Subject: [PATCH 7/7] update openmpi.spec. Signed-off-by: ZZJ <1220292247@qq.com> --- openmpi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index 16045aa..2a5f5a6 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -1,6 +1,6 @@ Name: openmpi Version: 4.1.4 -Release: 7 +Release: 5 Summary: Open Source High Performance Computing License: BSD-3-Clause URL: http://www.open-mpi.org/ @@ -214,7 +214,7 @@ make check %{_mandir}/%{name_all}/man*/* %changelog -* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.4-7 +* Mon Aug 19 2024 zhangzijian <1220292247@qq.com> - 4.1.4-5 - Modify multicore caused finalize timeout error * Thu Feb 1 2024 peng.zou - 4.1.4-4 -- Gitee