Rebase to latest upstream release PSM2_11.2.206
Resolves: rhbz#2015389 Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
Honggang Li
parent
8bea4bd37d
commit
b4aa1dc7be
|
|
@ -7,3 +7,4 @@
|
|||
/libpsm2-11.2.78.tar.gz
|
||||
/libpsm2-11.2.86.tar.gz
|
||||
/libpsm2-11.2.185.tar.gz
|
||||
/libpsm2-11.2.206.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
From 6e0231074111ff1fda0b2de1765e1988fda2e9c9 Mon Sep 17 00:00:00 2001
|
||||
From: Brendan Cunningham <bcunningham@cornelisnetworks.com>
|
||||
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 <bcunningham@cornelisnetworks.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -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;
|
||||
14
libpsm2.spec
14
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 <honli@redhat.com> - 11.2.206-1
|
||||
- Rebase to latest upstream release PSM2_11.2.206
|
||||
- Resolves: rhbz#2015389
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.2.185-2
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libpsm2-11.2.185.tar.gz) = a418edac2366213e16be9cfcbf0483be65940a6db8cf3cb240bfbb16b58d0b8277f3b7a4fd888c1992201bf6918a79183de08e8f1fecb8c46324dd69daed836e
|
||||
SHA512 (libpsm2-11.2.206.tar.gz) = 0b9d1ec7dcb4c01368c91d20c41161d911769ba179ffeef33c1d5409760ed76274f87b7e2f7c044acb3af7c2cad351fd7f117f2e144e9f50019d57adfa6045b7
|
||||
|
|
|
|||
Loading…
Reference in New Issue