From dc8a0179fa4f4988da205e444eb6061a18ab2f9526c08b8aeeed520c8d646de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 27 Dec 2024 15:56:31 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main openmpi4 revision afd9f5a455d0ce161533d4281f564172 --- _service | 6 ++-- ...x-missing-definition-of-container_of.patch | 24 +++++++++++++ openmpi-4.1.6.0.439b23db6288.tar.bz2 | 3 -- openmpi-4.1.7.0.6b7e5d9911d1.tar.bz2 | 3 ++ openmpi4.changes | 36 +++++++++++++++++++ openmpi4.spec | 7 ++-- 6 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 mtl-ofi-fix-missing-definition-of-container_of.patch delete mode 100644 openmpi-4.1.6.0.439b23db6288.tar.bz2 create mode 100644 openmpi-4.1.7.0.6b7e5d9911d1.tar.bz2 diff --git a/_service b/_service index 6241cdf..3e59d9b 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + git https://github.com/open-mpi/ompi.git no @@ -8,9 +8,9 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - 439b23db6288f0370f6fcc80c8c0a06ad86d6873 + 6b7e5d9911d13fad2954f2823779d6c480e08201 - + openmpi*.tar bz2 diff --git a/mtl-ofi-fix-missing-definition-of-container_of.patch b/mtl-ofi-fix-missing-definition-of-container_of.patch new file mode 100644 index 0000000..231c0b4 --- /dev/null +++ b/mtl-ofi-fix-missing-definition-of-container_of.patch @@ -0,0 +1,24 @@ +commit 75b6dad5959ba75fcba8c64cc0a364d820e03ebc +Author: Nicolas Morey +Date: Fri Dec 20 12:44:38 2024 +0100 + + mtl: ofi: fix missing definition of container_of + + Signed-off-by: Nicolas Morey + +diff --git ompi/mca/mtl/ofi/mtl_ofi_request.h ompi/mca/mtl/ofi/mtl_ofi_request.h +index f68c2a91baa0..6d748fd59bdc 100644 +--- ompi/mca/mtl/ofi/mtl_ofi_request.h ++++ ompi/mca/mtl/ofi/mtl_ofi_request.h +@@ -15,6 +15,11 @@ + + #include "mtl_ofi.h" + ++#ifndef container_of ++#define container_of(ptr, type, field) \ ++ ((type *) ((char *)ptr - offsetof(type, field))) ++#endif ++ + #define TO_OFI_REQ(_ptr_ctx) \ + container_of((_ptr_ctx), struct ompi_mtl_ofi_request_t, ctx) + diff --git a/openmpi-4.1.6.0.439b23db6288.tar.bz2 b/openmpi-4.1.6.0.439b23db6288.tar.bz2 deleted file mode 100644 index 1aed49a..0000000 --- a/openmpi-4.1.6.0.439b23db6288.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10610ab832942c763acc2dd31a8eb3cb8da3e1f36b57a7971857b0bf625e6d4a -size 6564781 diff --git a/openmpi-4.1.7.0.6b7e5d9911d1.tar.bz2 b/openmpi-4.1.7.0.6b7e5d9911d1.tar.bz2 new file mode 100644 index 0000000..e529ce4 --- /dev/null +++ b/openmpi-4.1.7.0.6b7e5d9911d1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a08aa1b3af58db17116d4ad49ad1436efe4fc253d993021e584f0629901cc32 +size 6571210 diff --git a/openmpi4.changes b/openmpi4.changes index ed3b14b..ea11ff3 100644 --- a/openmpi4.changes +++ b/openmpi4.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Fri Dec 20 11:46:32 UTC 2024 - Nicolas Morey + +- Add mtl-ofi-fix-missing-definition-of-container_of.patch to fix + compilation with libfabric >= 2.0 (jsc#PED-9661, jsc#PED-10668) + +------------------------------------------------------------------- +Tue Nov 26 07:12:00 UTC 2024 - Nicolas Morey + +- Update to 4.1.7 (jsc#PED-11355): + - Fix int overflow bug in UCC collectives routine, which would impact + large message collectives. + - Fix SHMEM bounds checking warnings + - Fix memory leak in the fcoll/vulcan component + - Fix memory leak when using non-contiguious datatyles with pml/cm + (used when using Libfabric or Portals transports) + - Change default locking protocol for ufs IO component to fix data + sieving use case. + - Fix bug in Fortran / C interface array calculation. + - Fix potential initialization in UCX OpenSHMEM support + - Add OpenSHMEM support for symmetric remote key handling to improve + scalability of OpenSHMEM interface. + - Add MCS Locks as default implementation for OpenSHMEM locks. + - Fix bug to properly handle ORTE Prefix of "/". + - Fix bug in I/O interface handling of soft links on Lustre + filesystems. + - Fix memory leak in UCX one-sided implementation. + - Fix bug in rcache components that could lead to assert on macOS + systems. + - Fix mishandling of a NULL completion context in the OFI transport. + - Tarballs are now built with the tar-pax format. + - Set MPI_THREAD_SERIALIZED instead of MPI_THREAD_SINGLE as supported + threading model when using UCX that supports + UCS_THREAD_MODE_SERIALIZED. + - Fix issue that would prevent using Libfabric 2.x releases. + ------------------------------------------------------------------- Thu Sep 5 06:58:41 UTC 2024 - Nicolas Morey diff --git a/openmpi4.spec b/openmpi4.spec index 7106037..724059e 100644 --- a/openmpi4.spec +++ b/openmpi4.spec @@ -42,7 +42,7 @@ # % define build_static_devel 1 %global pname openmpi -%define _vers 4_1_6 +%define _vers 4_1_7 %define m_f_ver 4 %bcond_with ringdisabled @@ -124,7 +124,7 @@ ExcludeArch: i586 %arm s390 %{bcond_with hwloc} %endif -%define git_ver .0.439b23db6288 +%define git_ver .0.6b7e5d9911d1 ############################################################################# # @@ -133,7 +133,7 @@ ExcludeArch: i586 %arm s390 ############################################################################# Name: %{package_name}%{?testsuite:-testsuite} -Version: 4.1.6 +Version: 4.1.7 Release: 0 Summary: An implementation of MPI/SHMEM (Version %{m_f_ver}) License: BSD-3-Clause @@ -148,6 +148,7 @@ Patch1: orted-mpir-add-version-to-shared-library.patch Patch2: btl-openib-Add-VF-support-for-ConnectX-4-5-and-6.patch Patch3: openmpi4-C99.diff Patch4: test-datatype-partial.c-fix-compiler-warnings.patch +Patch5: mtl-ofi-fix-missing-definition-of-container_of.patch Provides: mpi BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf