rpms/mvapich2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream release 2.3.7-1

Browse Source 
Resolves: rhbz#2212461
Signed-off-by: Kamal Heib <kheib@redhat.com>
This commit is contained in:
Kamal Heib 2023-06-05 12:26:06 -04:00
parent 633ba4c1c5
commit e47192cb21
6 changed files with 51 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/mvapich2-2.3.5-2.tar.gz /mvapich2-2.3.5-2.tar.gz
/mvapich2-2.3.6.tar.gz /mvapich2-2.3.6.tar.gz
/mvapich2-2.3.7-1.tar.gz

39
0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch Normal file
View File

@ -0,0 +1,39 @@
From 1dc75ee70e44d3dea69392f7e6eca5913d5ef143 Mon Sep 17 00:00:00 2001
From: Kamal Heib <kheib@redhat.com>
Date: Mon, 5 Jun 2023 10:05:38 -0400
Subject: [PATCH] mvapich23: unbundle contrib/hwloc and osu_benchmarks
Signed-off-by: Kamal Heib <kheib@redhat.com>
---
Makefile.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index ced43d104194..eab3cfacf5c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3050,14 +3050,14 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
@BUILD_F77_BINDING_TRUE@@BUILD_PROFILING_LIB_TRUE@am__append_184 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
@BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_185 = $(mpi_fc_sources)
@BUILD_CXX_BINDING_TRUE@am__append_186 = lib/lib@MPICXXLIBNAME@.la
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 = contrib/hwloc_v1
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_188 = contrib/hwloc_v2
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 =
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_188 =
@BUILD_OSU_MVAPICH_TRUE@am__append_189 = src/env/mpiname src/util/mv2_ckpt_rebuild
-@BUILD_OMB_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 = osu_benchmarks
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 = -Icontrib/hwloc_v1/include/ -I$(top_srcdir)/contrib/hwloc_v1/include
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 = contrib/hwloc_v1/src/libhwloc_embedded.la
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_193 = -Icontrib/hwloc_v2/include/ -I$(top_srcdir)/contrib/hwloc_v2/include
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_194 = contrib/hwloc_v2/hwloc/libhwloc_embedded.la
+@BUILD_OMB_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 =
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 =
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 = -lhwloc
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_193 =
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_194 = -lhwloc
@BUILD_COVERAGE_TRUE@am__append_195 = coverage-clean
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--
2.40.1

37
0001-mvapich23-unbundle-contrib-hwloc.patch
View File

@ -1,37 +0,0 @@
From f79ed575359a3626fcb680922bb0422232dd3fd4 Mon Sep 17 00:00:00 2001
From: Honggang-LI <honli@redhat.com>
Date: Thu, 13 May 2021 20:17:14 +0800
Subject: [PATCH 1/2] mvapich23: unbundle contrib/hwloc
Signed-off-by: Honggang-LI <honli@redhat.com>
---
Makefile.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 00460c3999f3..645c8cab7a3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3050,13 +3050,13 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
@BUILD_F77_BINDING_TRUE@@BUILD_PROFILING_LIB_TRUE@am__append_184 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
@BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_185 = $(mpi_fc_sources)
@BUILD_CXX_BINDING_TRUE@am__append_186 = lib/lib@MPICXXLIBNAME@.la
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 = contrib/hwloc_v1
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_188 = contrib/hwloc_v2
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 =
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_188 =
@BUILD_OSU_MVAPICH_TRUE@am__append_189 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 = -Icontrib/hwloc_v1/include/ -I$(top_srcdir)/contrib/hwloc_v1/include
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 = contrib/hwloc_v1/src/libhwloc_embedded.la
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 = -Icontrib/hwloc_v2/include/ -I$(top_srcdir)/contrib/hwloc_v2/include
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_193 = contrib/hwloc_v2/hwloc/libhwloc_embedded.la
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 =
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 = -lhwloc
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 =
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_193 = -lhwloc
@BUILD_COVERAGE_TRUE@am__append_194 = coverage-clean
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--
2.25.4

26
0002-mvapich23-unbundle-osu_benchmarks.patch
View File

@ -1,26 +0,0 @@
From e1b6d197f292cb192570aa7cb21047357e70b8d5 Mon Sep 17 00:00:00 2001
From: Honggang-LI <honli@redhat.com>
Date: Thu, 13 May 2021 20:18:38 +0800
Subject: [PATCH 2/2] mvapich23: unbundle osu_benchmarks
Signed-off-by: Honggang-LI <honli@redhat.com>
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 645c8cab7a3d..3485b6d181fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3052,7 +3052,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
@BUILD_CXX_BINDING_TRUE@am__append_186 = lib/lib@MPICXXLIBNAME@.la
@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 =
@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_188 =
-@BUILD_OSU_MVAPICH_TRUE@am__append_189 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
+@BUILD_OSU_MVAPICH_TRUE@am__append_189 = src/env/mpiname src/util/mv2_ckpt_rebuild
@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 =
@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 = -lhwloc
@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 =
--
2.25.4

17
mvapich2.spec
View File

@ -1,8 +1,9 @@
%{!?python3_sitearch: %global python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?python3_sitearch: %global python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: mvapich2 Name: mvapich2
Version: 2.3.6 %global upstream_ver 2.3.7-1
Release: 3%{?dist} Version: %{lua: print((string.gsub(rpm.expand("%{upstream_ver}"),"-",".")))}
Release: 1%{?dist}
Summary: OSU MVAPICH2 MPI package Summary: OSU MVAPICH2 MPI package
Group: Development/Libraries Group: Development/Libraries
# Richard Fontana wrote in https://bugzilla.redhat.com/show_bug.cgi?id=1333114: # Richard Fontana wrote in https://bugzilla.redhat.com/show_bug.cgi?id=1333114:
@ -18,13 +19,12 @@ Group: Development/Libraries
## other than LGPL). ## other than LGPL).
License: BSD and MIT License: BSD and MIT
URL: http://mvapich.cse.ohio-state.edu URL: http://mvapich.cse.ohio-state.edu
Source: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/%{name}-%{version}.tar.gz Source: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.3.7-1.tar.gz
Source1: mvapich2.module.in Source1: mvapich2.module.in
Source2: mvapich2.macros.in Source2: mvapich2.macros.in
# We delete bundled stuff in the prep step. The *-unbundle-* patches adjust # We delete bundled stuff in the prep step. The *-unbundle-* patches adjust
# the configure scripts and Makefiles accordingly. # the configure scripts and Makefiles accordingly.
Patch1: 0001-mvapich23-unbundle-contrib-hwloc.patch Patch1: 0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch
Patch2: 0002-mvapich23-unbundle-osu_benchmarks.patch
BuildRequires: gcc-gfortran, gcc-c++ BuildRequires: gcc-gfortran, gcc-c++
BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel
@ -91,9 +91,8 @@ Contains development headers and libraries for %{name}-psm2.
%endif %endif
%prep %prep
%setup -q %setup -q -n %{name}-%{upstream_ver}
%patch1 -p1 %patch1 -p1
%patch2 -p1
# bundled hwloc, knem kernel module # bundled hwloc, knem kernel module
rm -r contrib/ rm -r contrib/
# limic kernel module # limic kernel module
@ -347,6 +346,10 @@ cd ..
%changelog %changelog
* Mon Jun 05 2023 Kamal Heib <kheib@redhat.com> - 2.3.7.1-1
- Update to upstream release 2.3.7-1
- Resolves: rhbz#2212461
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.6-3 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.6-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688

2
sources
View File

@ -1 +1 @@
SHA512 (mvapich2-2.3.6.tar.gz) = 9b76b0d2619a9e448165a098da962896f4eecce183cc75a85f16b0249f565f537b1551bfca00eb4cd94d80dc4de9ee603623137612388b1389237f984e08ee67 SHA512 (mvapich2-2.3.7-1.tar.gz) = 27e3f2018f205e97ea46d5474cc382e08af2cdf165b484dcd5bce602ce8800807798db913b6aed056fb09b9f0f45ab4188141d7fa074ee5ce55b0b7d207dcd50