From 0f61b124bb7e795563c7bc849237c3f21e5a3243 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 27 Sep 2023 13:42:50 +0000 Subject: [PATCH] import CS mvapich2-2.3.7.1-1.el8 --- .gitignore | 2 +- .mvapich2.metadata | 2 +- ...dle-contrib-hwloc-and-osu_benchmarks.patch | 39 +++++++++++++++++++ ...001-mvapich23-unbundle-contrib-hwloc.patch | 37 ------------------ ...02-mvapich23-unbundle-osu_benchmarks.patch | 26 ------------- SPECS/mvapich2.spec | 16 +++++--- 6 files changed, 51 insertions(+), 71 deletions(-) create mode 100644 SOURCES/0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch delete mode 100644 SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch delete mode 100644 SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch diff --git a/.gitignore b/.gitignore index de90a9c..aed4184 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mvapich2-2.3.6.tar.gz +SOURCES/mvapich2-2.3.7-1.tar.gz diff --git a/.mvapich2.metadata b/.mvapich2.metadata index 1281003..c53f537 100644 --- a/.mvapich2.metadata +++ b/.mvapich2.metadata @@ -1 +1 @@ -0cb41a1f58b2e155bac35a44a53e4f29829bef21 SOURCES/mvapich2-2.3.6.tar.gz +1672258b9fe58eae02beea1020344fb26a99de7d SOURCES/mvapich2-2.3.7-1.tar.gz diff --git a/SOURCES/0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch b/SOURCES/0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch new file mode 100644 index 0000000..66aaf4d --- /dev/null +++ b/SOURCES/0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch @@ -0,0 +1,39 @@ +From 1dc75ee70e44d3dea69392f7e6eca5913d5ef143 Mon Sep 17 00:00:00 2001 +From: Kamal Heib +Date: Mon, 5 Jun 2023 10:05:38 -0400 +Subject: [PATCH] mvapich23: unbundle contrib/hwloc and osu_benchmarks + +Signed-off-by: Kamal Heib +--- + 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 + diff --git a/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch b/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch deleted file mode 100644 index a67a48b..0000000 --- a/SOURCES/0001-mvapich23-unbundle-contrib-hwloc.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f79ed575359a3626fcb680922bb0422232dd3fd4 Mon Sep 17 00:00:00 2001 -From: Honggang-LI -Date: Thu, 13 May 2021 20:17:14 +0800 -Subject: [PATCH 1/2] mvapich23: unbundle contrib/hwloc - -Signed-off-by: Honggang-LI ---- - 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 - diff --git a/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch b/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch deleted file mode 100644 index 8ddd07d..0000000 --- a/SOURCES/0002-mvapich23-unbundle-osu_benchmarks.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e1b6d197f292cb192570aa7cb21047357e70b8d5 Mon Sep 17 00:00:00 2001 -From: Honggang-LI -Date: Thu, 13 May 2021 20:18:38 +0800 -Subject: [PATCH 2/2] mvapich23: unbundle osu_benchmarks - -Signed-off-by: Honggang-LI ---- - 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 - diff --git a/SPECS/mvapich2.spec b/SPECS/mvapich2.spec index 17b1fcd..d6a37cc 100644 --- a/SPECS/mvapich2.spec +++ b/SPECS/mvapich2.spec @@ -1,7 +1,8 @@ %{!?python3_sitearch: %global python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: mvapich2 -Version: 2.3.6 +%global upstream_ver 2.3.7-1 +Version: %{lua: print((string.gsub(rpm.expand("%{upstream_ver}"),"-",".")))} Release: 1%{?dist} Summary: OSU MVAPICH2 MPI package Group: Development/Libraries @@ -18,13 +19,12 @@ Group: Development/Libraries ## other than LGPL). License: BSD and MIT 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 Source2: mvapich2.macros.in # We delete bundled stuff in the prep step. The *-unbundle-* patches adjust # the configure scripts and Makefiles accordingly. -Patch1: 0001-mvapich23-unbundle-contrib-hwloc.patch -Patch2: 0002-mvapich23-unbundle-osu_benchmarks.patch +Patch1: 0001-mvapich23-unbundle-contrib-hwloc-and-osu_benchmarks.patch BuildRequires: gcc-gfortran BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel @@ -91,9 +91,8 @@ Contains development headers and libraries for %{name}-psm2. %endif %prep -%setup -q +%setup -q -n %{name}-%{upstream_ver} %patch1 -p1 -%patch2 -p1 # bundled hwloc, knem kernel module rm -r contrib/ # limic kernel module @@ -346,6 +345,11 @@ cd .. %changelog +* Mon Jun 05 2023 Kamal Heib - 2.3.7.1-1 +- Update to upstream release 2.3.7-1 +- Add gating tests +- Resolves: rhbz#2212462 + * Thu May 13 2021 Honggang Li - 2.3.6-1 - Update to upstream stable point release v2.3.6 - Resolves: rhbz#1960073