From 2fcaa856a23ebf9c6dcc6d01b6b8b1555ecfadd3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 06:47:40 -0500 Subject: [PATCH] import mvapich2-2.3.3-1.el8 --- .gitignore | 2 +- .mvapich2.metadata | 2 +- ...nit-calculation-for-non-NUMA-machine.patch | 40 +++++++++++++++++++ SPECS/mvapich2.spec | 11 ++++- 4 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-Fix-Processing-Unit-calculation-for-non-NUMA-machine.patch diff --git a/.gitignore b/.gitignore index d422a6d..00f399a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mvapich2-2.3.2.tar.gz +SOURCES/mvapich2-2.3.3.tar.gz diff --git a/.mvapich2.metadata b/.mvapich2.metadata index 805da52..e1f91d7 100644 --- a/.mvapich2.metadata +++ b/.mvapich2.metadata @@ -1 +1 @@ -19b051db6e4140afa9bc608274ba1f87a4116a34 SOURCES/mvapich2-2.3.2.tar.gz +c53074dd0836a250e7fd5a76bf1cc1ba9320f841 SOURCES/mvapich2-2.3.3.tar.gz diff --git a/SOURCES/0001-Fix-Processing-Unit-calculation-for-non-NUMA-machine.patch b/SOURCES/0001-Fix-Processing-Unit-calculation-for-non-NUMA-machine.patch new file mode 100644 index 0000000..2d60988 --- /dev/null +++ b/SOURCES/0001-Fix-Processing-Unit-calculation-for-non-NUMA-machine.patch @@ -0,0 +1,40 @@ +From 3ba35a3261e2222326b3d81f273d3e8261cad942 Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Thu, 2 Apr 2020 18:29:43 +0800 +Subject: [PATCH] Fix Processing Unit calculation for non-NUMA machine + +For hwloc without commit ba7d4976d38f, function + +hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_NUMANODE) + +return zero instead of one when no NUMA node exists. + +This patch fixes a floating point exception issue for non-NUMA +machine. + +Signed-off-by: Honggang Li +--- + src/mpid/ch3/channels/common/src/affinity/hwloc_bind.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/mpid/ch3/channels/common/src/affinity/hwloc_bind.c b/src/mpid/ch3/channels/common/src/affinity/hwloc_bind.c +index 7afb9f74248d..f1a1f1fefb97 100644 +--- a/src/mpid/ch3/channels/common/src/affinity/hwloc_bind.c ++++ b/src/mpid/ch3/channels/common/src/affinity/hwloc_bind.c +@@ -2748,7 +2748,12 @@ static int mv2_generate_implicit_cpu_mapping (int local_procs, int num_app_threa + + num_physical_cores_per_socket = num_physical_cores / num_sockets; + num_pu_per_socket = num_pu / num_sockets; +- num_pu_per_numanode = num_pu / num_numanodes; ++ ++ /* non-NUMA */ ++ if (num_numanodes == 0) ++ num_pu_per_numanode = num_pu; ++ else ++ num_pu_per_numanode = num_pu / num_numanodes; + + topodepth = hwloc_get_type_depth (topology, HWLOC_OBJ_CORE); + obj = hwloc_get_obj_by_depth (topology, topodepth, 0); /* check on core 0*/ +-- +2.25.2 + diff --git a/SPECS/mvapich2.spec b/SPECS/mvapich2.spec index cd7ad03..c22a54a 100644 --- a/SPECS/mvapich2.spec +++ b/SPECS/mvapich2.spec @@ -29,8 +29,8 @@ %endif Name: mvapich2 -Version: 2.3.2 -Release: 2%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: OSU MVAPICH2 MPI package Group: Development/Libraries # Richard Fontana wrote in https://bugzilla.redhat.com/show_bug.cgi?id=1333114: @@ -53,6 +53,7 @@ Source2: mvapich2.macros.in # the configure scripts and Makefiles accordingly. Patch1: 0001-mvapich23-unbundle-contrib-hwloc.patch Patch2: 0002-mvapich23-unbundle-osu_benchmarks.patch +Patch3: 0001-Fix-Processing-Unit-calculation-for-non-NUMA-machine.patch BuildRequires: gcc-gfortran BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel @@ -122,6 +123,7 @@ Contains development headers and libraries for %{name}-psm2. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 # bundled hwloc, knem kernel module rm -r contrib/ # limic kernel module @@ -390,6 +392,11 @@ cd .. %changelog +* Wed Apr 15 2020 Honggang Li - 2.3.3-1 +- Update to upstream stable point release v2.3.3 +- Fix floating point exception for non-NUMA machine +- Resolves: rhbz#1815962, rhbz#1814296 + * Tue Nov 19 2019 Jarod Wilson 2.3.2-2 - Add BR: rdma-core-devel and infiniband-diags-devel for infiniband/mad.h - Related: rhbz#1708656