diff --git a/.gitignore b/.gitignore index 7072623..3f964d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libpsm2-11.2.185.tar.gz +SOURCES/libpsm2-11.2.206.tar.gz diff --git a/.libpsm2.metadata b/.libpsm2.metadata index 549ff91..55fe2ae 100644 --- a/.libpsm2.metadata +++ b/.libpsm2.metadata @@ -1 +1 @@ -725613650b5647ceb7bc5e47a9b9d296bea5d3be SOURCES/libpsm2-11.2.185.tar.gz +e15888e537e80751ebf010658b1193950424efdc SOURCES/libpsm2-11.2.206.tar.gz diff --git a/SOURCES/0001-README-add-section-about-OMPI-4.1.x-OFI-BTL-and-high.patch b/SOURCES/0001-README-add-section-about-OMPI-4.1.x-OFI-BTL-and-high.patch deleted file mode 100644 index 8f7e90b..0000000 --- a/SOURCES/0001-README-add-section-about-OMPI-4.1.x-OFI-BTL-and-high.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6e0231074111ff1fda0b2de1765e1988fda2e9c9 Mon Sep 17 00:00:00 2001 -From: Brendan Cunningham -Date: Fri, 7 May 2021 16:33:35 -0400 -Subject: [PATCH] README: add section about OMPI 4.1.x, OFI BTL, and high-PPN - jobs. - -Signed-off-by: Brendan Cunningham ---- - README | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/README b/README -index 7990555..2961534 100644 ---- a/README -+++ b/README -@@ -67,7 +67,6 @@ Contains the following sections: - - INSTALLING - * INSTALLING USING MAKEFILE - * INSTALLING USING EITHER YUM OR DNF --- TESTING - - RELATED SOFTWARE TO PSM2 - - SUPPORTING DOCUMENTATION - -@@ -251,6 +250,24 @@ libraries available on them. Open MPI provides a standard configure, make and - make install mechanism which will detect and build the relevant PSM2 network - modules for Open MPI once the header and runtime files are detected. - -+Open MPI 4.1.x, OFI BTL, and high PPN jobs -+---------------- -+Open MPI added the OFI BTL for one-sided communication. On an OPA fabric, the -+OFI BTL may use the PSM2 OFI provider underneath. If PSM2 is in-use as both -+the MTL (directly or via OFI) and the BTL (via OFI), then each rank in the -+Open MPI job will require two PSM2 endpoints and PSM2 context-sharing will -+be disabled. -+ -+In this case, total number of PSM2 ranks on a node can be no more than: -+ (num_hfi * num_user_contexts)/2 -+Where num_user_contexts is typically equal to the number of physical CPU -+cores on that node. -+ -+If your job does not require an inter-node BTL (e.g. OFI), then you can -+disable the OFI BTL in one of two ways: -+ 1. When building Open MPI, specify '--with-ofi=no' when you run 'configure'. -+ 2. When running your Open MPI job, add '-mca btl self,vader'. -+ - MVAPICH2 support - ---------------- - MVAPICH2 supports PSM2 transport for optimized communication on HFI hardware. --- -2.32.0 - diff --git a/SOURCES/libpsm2-gcc11.patch b/SOURCES/libpsm2-gcc11.patch deleted file mode 100644 index 285046d..0000000 --- a/SOURCES/libpsm2-gcc11.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nrup a/include/linux-i386/sysdep.h b/include/linux-i386/sysdep.h ---- a/include/linux-i386/sysdep.h 2019-10-03 20:00:29.000000000 -0600 -+++ b/include/linux-i386/sysdep.h 2020-10-19 16:10:45.680585173 -0600 -@@ -139,12 +139,18 @@ static __inline__ uint32_t ips_cmpxchg(v - uint32_t old_val, uint32_t new_val) - { - uint32_t prev; -- struct xchg_dummy { -- uint32_t a[100]; -- }; - -+ /* This code used to cast PTR to a type which was an array of 100 -+ uint32_t objects. That makes no sense as the cmpxchgl's side -+ effect can be covered by an single int. -+ -+ The semantics of GCC's ASMs for memory is that it clobbers the -+ whole pointed-to object. Thus analyzers saw a 100 uint32_t sized -+ store which triggers diagnostics for out of bounds array writes. -+ -+ The cast to the dummy type has been removed. */ - asm volatile (LOCK_PREFIX "cmpxchgl %1,%2" : "=a"(prev) -- : "q"(new_val), "m"(*(struct xchg_dummy *)ptr), "0"(old_val) -+ : "q"(new_val), "m"(*ptr), "0"(old_val) - : "memory"); - - return prev; diff --git a/SPECS/libpsm2.spec b/SPECS/libpsm2.spec index 306ab72..cc81dd9 100644 --- a/SPECS/libpsm2.spec +++ b/SPECS/libpsm2.spec @@ -52,19 +52,17 @@ # Summary: Intel PSM Libraries Name: libpsm2 -Version: 11.2.185 -Release: 2%{?dist} +Version: 11.2.206 +Release: 1%{?dist} License: BSD or GPLv2 URL: https://github.com/cornelisnetworks/opa-psm2/ # The tarball can be created by: # git clone https://github.com/cornelisnetworks/opa-psm2.git # cd opa-psm2 -# git checkout 7a33bedc4bb3dff4e57c00293a2d70890db4d983 +# git checkout c3a7d9468d5623c0164b783346bada8664a9a2c9 # make dist Source0: %{name}-%{version}.tar.gz -Patch2: %{name}-gcc11.patch -Patch3: 0001-README-add-section-about-OMPI-4.1.x-OFI-BTL-and-high.patch # The OPA product is supported on x86_64 only: ExclusiveArch: x86_64 @@ -104,8 +102,6 @@ Support for MPIs linked with PSM versions < 2 %prep %setup -q -%patch2 -p1 -%patch3 -p1 %build %{set_build_flags} @@ -151,6 +147,10 @@ rm -f %{buildroot}%{_libdir}/*.a %endif %changelog +* Tue Dec 07 2021 Honggang Li - 11.2.206-1 +- Rebase to latest upstream release PSM2_11.2.206 +- Resolves: rhbz#2015389 + * Mon Aug 09 2021 Mohan Boddu - 11.2.185-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688