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

Update to upstream stable point release v2.3.6 

Resolves: rhbz#1960478

Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
Honggang Li 2021-06-20 07:30:20 -04:00
parent 83b7dce6db
commit 9d6c809a29
5 changed files with 193 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

22
unbundle-contrib-hwloc-and-osu_benchmarks.patch → 0001-mvapich23-unbundle-contrib-hwloc.patch
View File

@ -1,5 +1,15 @@
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 9e2d9bde248f..789a69723c9e 100644
index 00460c3999f3..645c8cab7a3d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3050,13 +3050,13 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
@ -8,14 +18,13 @@ index 9e2d9bde248f..789a69723c9e 100644
@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_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_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_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_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 =
@ -23,3 +32,6 @@ index 9e2d9bde248f..789a69723c9e 100644
@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 Normal file
View File

@ -0,0 +1,26 @@
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

154
mvapich2.spec
View File

@ -1,8 +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.5
Release: 3%{?dist}
Version: 2.3.6
Release: 1%{?dist}
Summary: OSU MVAPICH2 MPI package
Group: Development/Libraries
# Richard Fontana wrote in https://bugzilla.redhat.com/show_bug.cgi?id=1333114:
@ -18,12 +18,13 @@ 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}-2.tar.gz
Source: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/%{name}-%{version}.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: unbundle-contrib-hwloc-and-osu_benchmarks.patch
Patch1: 0001-mvapich23-unbundle-contrib-hwloc.patch
Patch2: 0002-mvapich23-unbundle-osu_benchmarks.patch
BuildRequires: gcc-gfortran, gcc-c++
BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel
@ -31,6 +32,9 @@ BuildRequires: python3-devel, perl-Digest-MD5, hwloc-devel, rdma-core-devel
BuildRequires: bison, flex
BuildRequires: autoconf, automake, libtool
BuildRequires: rpm-mpi-hooks, rdma-core-devel, infiniband-diags-devel
%ifarch x86_64
BuildRequires: libpsm2-devel >= 10.3.58
%endif
ExcludeArch: s390 s390x
Provides: mpi
Requires: environment-modules
@ -60,9 +64,36 @@ BuildArch: noarch
%description doc
Additional documentation for mvapich2.
%ifarch x86_64
%package psm2
Summary: OSU MVAPICH2 MPI package 2.3 for Omni-Path adapters
Group: Development/Libraries
Provides: mpi
Requires: environment-modules
%description psm2
%{common_desc}
This is a version of mvapich2 2.3 that uses the PSM2 transport for Omni-Path
adapters.
%package psm2-devel
Summary: Development files for %{name}-psm2
Group: Development/Libraries
Provides: mpi-devel
Requires: librdmacm-devel, libibverbs-devel, libibumad-devel
Requires: %{name}-psm2%{?_isa} = %{version}-%{release}
Requires: gcc-gfortran
%description psm2-devel
Contains development headers and libraries for %{name}-psm2.
%endif
%prep
%setup -q -n mvapich2-2.3.5-2
%setup -q
%patch1 -p1
%patch2 -p1
# bundled hwloc, knem kernel module
rm -r contrib/
# limic kernel module
@ -74,16 +105,63 @@ rm -r osu_benchmarks/
find . -name configure -exec \
sed -i -r 's/(hardcode_into_libs)=.*$/\1=no/' '{}' ';'
mkdir .default
mv * .default
mv .default default
%ifarch x86_64
cp -pr default psm2
%endif
%build
%set_build_flags
export FFLAGS="$FFLAGS -fallow-argument-mismatch"
export AR=ar
%ifarch x86_64
%global variant %{name}-psm2
%global libname %{variant}
%global namearch %{variant}-%{_arch}
cd psm2
./configure \
--prefix=%{_libdir}/%{libname} \
--exec-prefix=%{_libdir}/%{libname} \
--bindir=%{_libdir}/%{libname}/bin \
--sbindir=%{_libdir}/%{libname}/bin \
--libdir=%{_libdir}/%{libname}/lib \
--mandir=%{_mandir}/%{namearch} \
--includedir=%{_includedir}/%{namearch} \
--sysconfdir=%{_sysconfdir}/%{namearch} \
--datarootdir=%{_datadir}/%{libname} \
--docdir=%{_docdir}/%{name} \
--enable-error-checking=runtime \
--enable-timing=none \
--enable-g=mem,dbg,meminit \
--enable-fast=all \
--enable-shared \
--enable-static \
--enable-fortran=all \
--enable-cxx \
--disable-silent-rules \
--disable-wrapper-rpath \
--with-hwloc=v2 \
--with-device=ch3:psm
# Remove rpath, part 2
find . -name libtool -exec \
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' '{}' ';'
make %{?_smp_mflags}
cd ..
%endif
%global variant %{name}
%global libname %{variant}
%global namearch %{variant}-%{_arch}
cd default
./configure \
--prefix=%{_libdir}/%{libname} \
--exec-prefix=%{_libdir}/%{libname} \
@ -112,6 +190,7 @@ find . -name libtool -exec \
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' '{}' ';'
make %{?_smp_mflags}
cd ..
%install
@ -155,8 +234,17 @@ finish_install() {
# 'make install' fails to mkdir docdir by itself before installing index.html
mkdir -p %{buildroot}%{_docdir}/%{name}
%ifarch x86_64
cd psm2
%make_install
finish_install %{name}-psm2 %SOURCE1 %SOURCE2 ""
cd ..
%endif
cd default
%make_install
finish_install %{name} %SOURCE1 %SOURCE2 ""
cd ..
%global variant %{name}
%global libname %{variant}
@ -208,7 +296,61 @@ finish_install %{name} %SOURCE1 %SOURCE2 ""
%files doc
%{_docdir}/%{name}
%ifarch x86_64
%global variant %{name}-psm2
%global libname %{variant}
%global namearch %{variant}-%{_arch}
%files psm2
%dir %{_libdir}/%{libname}
%dir %{_libdir}/%{libname}/bin
%dir %{_libdir}/%{libname}/lib
%dir %{_mandir}/%{namearch}
%dir %{_mandir}/%{namearch}/man*
%dir %{_fmoddir}/%{libname}
%dir %{python3_sitearch}/%{libname}
%{_libdir}/%{libname}/bin/hydra_nameserver
%{_libdir}/%{libname}/bin/hydra_persist
%{_libdir}/%{libname}/bin/hydra_pmi_proxy
%{_libdir}/%{libname}/bin/mpichversion
%{_libdir}/%{libname}/bin/mpiexec
%{_libdir}/%{libname}/bin/mpiexec.hydra
%{_libdir}/%{libname}/bin/mpiexec.mpirun_rsh
%{_libdir}/%{libname}/bin/mpiname
%{_libdir}/%{libname}/bin/mpirun
%{_libdir}/%{libname}/bin/mpirun_rsh
%{_libdir}/%{libname}/bin/mpispawn
%{_libdir}/%{libname}/bin/mpivars
%{_libdir}/%{libname}/bin/parkill
%{_libdir}/%{libname}/lib/*.so.*
%{_mandir}/%{namearch}/man1/hydra_*
%{_mandir}/%{namearch}/man1/mpiexec.*
%{_sysconfdir}/modulefiles/mpi/%{namearch}
%files psm2-devel
%dir %{_includedir}/%{namearch}
%{_sysconfdir}/rpm/macros.%{namearch}
%{_includedir}/%{namearch}/*
%{_libdir}/%{libname}/bin/mpic++
%{_libdir}/%{libname}/bin/mpicc
%{_libdir}/%{libname}/bin/mpicxx
%{_libdir}/%{libname}/bin/mpif77
%{_libdir}/%{libname}/bin/mpif90
%{_libdir}/%{libname}/bin/mpifort
%{_libdir}/%{libname}/lib/pkgconfig
%{_libdir}/%{libname}/lib/*.a
%{_libdir}/%{libname}/lib/*.so
%{_mandir}/%{namearch}/man1/mpi[cf]*
%{_mandir}/%{namearch}/man3/*
%endif
%changelog
* Sun Jun 20 2021 Honggang Li <honli@redhat.com> - 2.3.6-1
- Update to upstream stable point release v2.3.6
- Resolves: rhbz#1960478
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.5-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

2
sources
View File

@ -1 +1 @@
SHA512 (mvapich2-2.3.5-2.tar.gz) = 8873dd0b3484c2d63d6f72b0860cfb31454069adc87936986d2e53b990c0a9e93b6786552e981809d627bd8e886310908e05eb62604a4ff3837d527ec58d44e9
SHA512 (mvapich2-2.3.6.tar.gz) = 9b76b0d2619a9e448165a098da962896f4eecce183cc75a85f16b0249f565f537b1551bfca00eb4cd94d80dc4de9ee603623137612388b1389237f984e08ee67