Compare commits

..

No commits in common. "c8" and "imports/c8s/mvapich2-2.3.2-2.el8" have entirely different histories.

6 changed files with 111 additions and 72 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/mvapich2-2.3.7-1.tar.gz SOURCES/mvapich2-2.3.2.tar.gz

1
.mvapich2.metadata Normal file
View File

@ -0,0 +1 @@
19b051db6e4140afa9bc608274ba1f87a4116a34 SOURCES/mvapich2-2.3.2.tar.gz

View File

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

View File

@ -0,0 +1,30 @@
From c152d5a633876ff01ae69bd69d25c9ec08d0bbcb Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 3 Nov 2017 11:49:50 +0100
Subject: [PATCH 1/2] mvapich23: unbundle contrib/hwloc
---
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0d9ec512f5..ff3af667a4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3029,10 +3029,10 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
@BUILD_F77_BINDING_TRUE@@BUILD_PROFILING_LIB_TRUE@am__append_175 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
@BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_176 = $(mpi_fc_sources)
@BUILD_CXX_BINDING_TRUE@am__append_177 = lib/lib@MPICXXLIBNAME@.la
-@BUILD_OSU_MVAPICH_TRUE@am__append_178 = contrib/hwloc
+@BUILD_OSU_MVAPICH_TRUE@am__append_178 =
@BUILD_OSU_MVAPICH_TRUE@am__append_179 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
-@BUILD_OSU_MVAPICH_TRUE@am__append_180 = -Icontrib/hwloc/include/ -I$(top_srcdir)/contrib/hwloc/include
-@BUILD_OSU_MVAPICH_TRUE@am__append_181 = contrib/hwloc/src/libhwloc_embedded.la
+@BUILD_OSU_MVAPICH_TRUE@am__append_180 =
+@BUILD_OSU_MVAPICH_TRUE@am__append_181 = -lhwloc
@BUILD_COVERAGE_TRUE@am__append_182 = coverage-clean
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--
2.13.6

View File

@ -0,0 +1,25 @@
From 3aad06949ee9edbb6376092c6891efa9a37b8f51 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 3 Nov 2017 11:51:33 +0100
Subject: [PATCH 2/2] mvapich23: unbundle osu_benchmarks
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index ff3af667a4..21e2754b56 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3030,7 +3030,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
@BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_176 = $(mpi_fc_sources)
@BUILD_CXX_BINDING_TRUE@am__append_177 = lib/lib@MPICXXLIBNAME@.la
@BUILD_OSU_MVAPICH_TRUE@am__append_178 =
-@BUILD_OSU_MVAPICH_TRUE@am__append_179 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
+@BUILD_OSU_MVAPICH_TRUE@am__append_179 = src/env/mpiname src/util/mv2_ckpt_rebuild
@BUILD_OSU_MVAPICH_TRUE@am__append_180 =
@BUILD_OSU_MVAPICH_TRUE@am__append_181 = -lhwloc
@BUILD_COVERAGE_TRUE@am__append_182 = coverage-clean
--
2.13.6

View File

@ -1,9 +1,36 @@
# We only compile with gcc, but other people may want other compilers.
# Set the compiler here.
%define opt_cc gcc
# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
# so uncomment and define to use
#define opt_cflags
%define opt_cxx g++
#define opt_cxxflags
%define opt_f77 gfortran
#define opt_fflags
%define opt_fc gfortran
#define opt_fcflags
%{!?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)")}
%define opt_cflags -O3 -fno-strict-aliasing
%define opt_cxxflags -O3
%ifarch i386
%define opt_cflags -m32 -O3 -fno-strict-aliasing
%define opt_cxxflags -m32 -O3
%define opt_fflags -m32
%define opt_fcflags -m32
%endif
%ifarch x86_64
%define opt_cflags -m64 -O3 -fno-strict-aliasing
%define opt_cxxflags -m64 -O3
%define opt_fflags -m64
%define opt_fcflags -m64
%endif
Name: mvapich2 Name: mvapich2
%global upstream_ver 2.3.7-1 Version: 2.3.2
Version: %{lua: print((string.gsub(rpm.expand("%{upstream_ver}"),"-",".")))} Release: 2%{?dist}
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:
@ -19,12 +46,13 @@ 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/mvapich2-2.3.7-1.tar.gz Source: http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/%{name}-%{version}.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-and-osu_benchmarks.patch Patch1: 0001-mvapich23-unbundle-contrib-hwloc.patch
Patch2: 0002-mvapich23-unbundle-osu_benchmarks.patch
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel BuildRequires: libibumad-devel, libibverbs-devel >= 1.1.3, librdmacm-devel
@ -91,8 +119,9 @@ Contains development headers and libraries for %{name}-psm2.
%endif %endif
%prep %prep
%setup -q -n %{name}-%{upstream_ver} %setup -q
%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
@ -144,8 +173,16 @@ cd psm2
--enable-cxx \ --enable-cxx \
--disable-silent-rules \ --disable-silent-rules \
--disable-wrapper-rpath \ --disable-wrapper-rpath \
--with-hwloc=v2 \ --with-hwloc-prefix=system \
--with-device=ch3:psm --with-device=ch3:psm \
--with-ftb=no \
--with-blcr=no \
--with-fuse=no \
CC=%{opt_cc} CFLAGS="%{?opt_cflags} %{build_cflags} $XFLAGS" \
CXX=%{opt_cxx} CXXFLAGS="%{?opt_cxxflags} %{build_cflags} $XFLAGS" \
FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{build_cflags} $XFLAGS" \
F77=%{opt_f77} FFLAGS="%{?opt_fflags} %{build_cflags} $XFLAGS" \
LDFLAGS="%{build_ldflags}"
# Remove rpath, part 2 # Remove rpath, part 2
find . -name libtool -exec \ find . -name libtool -exec \
@ -181,7 +218,15 @@ cd default
--enable-cxx \ --enable-cxx \
--disable-silent-rules \ --disable-silent-rules \
--disable-wrapper-rpath \ --disable-wrapper-rpath \
--with-hwloc=v2 --with-hwloc-prefix=system \
--with-ftb=no \
--with-blcr=no \
--with-fuse=no \
CC=%{opt_cc} CFLAGS="%{?opt_cflags} %{build_cflags} $XFLAGS" \
CXX=%{opt_cxx} CXXFLAGS="%{?opt_cxxflags} %{build_cflags} $XFLAGS" \
FC=%{opt_fc} FCFLAGS="%{?opt_fcflags} %{build_cflags} $XFLAGS" \
F77=%{opt_f77} FFLAGS="%{?opt_fflags} %{build_cflags} $XFLAGS" \
LDFLAGS="%{build_ldflags}"
# Remove rpath, part 2 # Remove rpath, part 2
find . -name libtool -exec \ find . -name libtool -exec \
@ -345,29 +390,6 @@ 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
- Add gating tests
- Resolves: rhbz#2212462
* Thu May 13 2021 Honggang Li <honli@redhat.com> - 2.3.6-1
- Update to upstream stable point release v2.3.6
- Resolves: rhbz#1960073
* Tue Dec 01 2020 Honggang Li <honli@redhat.com> - 2.3.5-1
- Update to upstream stable point release v2.3.5
- Resolves: rhbz#1904914
* Wed Oct 14 2020 Honggang Li <honli@redhat.com> - 2.3.4-1
- Update to upstream stable point release v2.3.4
- Build against hwloc-2.2.0
- Resolves: rhbz#1850084
* Wed Apr 15 2020 Honggang Li <honli@redhat.com> - 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 <jarod@redhat.com> 2.3.2-2 * Tue Nov 19 2019 Jarod Wilson <jarod@redhat.com> 2.3.2-2
- Add BR: rdma-core-devel and infiniband-diags-devel for infiniband/mad.h - Add BR: rdma-core-devel and infiniband-diags-devel for infiniband/mad.h
- Related: rhbz#1708656 - Related: rhbz#1708656