Compare commits
No commits in common. "imports/c8-beta/mvapich2-2.3-5.el8" and "c8" have entirely different histories.
imports/c8
...
c8
|
|
@ -1 +1 @@
|
|||
SOURCES/mvapich2-2.3.tar.gz
|
||||
SOURCES/mvapich2-2.3.7-1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
03a4703431dd354a31edef97d018e3bf137c41e9 SOURCES/mvapich2-2.3.tar.gz
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
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_173 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
|
||||
@BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_174 = $(mpi_fc_sources)
|
||||
@BUILD_CXX_BINDING_TRUE@am__append_175 = lib/lib@MPICXXLIBNAME@.la
|
||||
-@BUILD_OSU_MVAPICH_TRUE@am__append_176 = contrib/hwloc
|
||||
+@BUILD_OSU_MVAPICH_TRUE@am__append_176 =
|
||||
@BUILD_OSU_MVAPICH_TRUE@am__append_177 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
|
||||
-@BUILD_OSU_MVAPICH_TRUE@am__append_178 = -Icontrib/hwloc/include/ -I$(top_srcdir)/contrib/hwloc/include
|
||||
-@BUILD_OSU_MVAPICH_TRUE@am__append_179 = contrib/hwloc/src/libhwloc_embedded.la
|
||||
+@BUILD_OSU_MVAPICH_TRUE@am__append_178 =
|
||||
+@BUILD_OSU_MVAPICH_TRUE@am__append_179 = -lhwloc
|
||||
@BUILD_COVERAGE_TRUE@am__append_180 = coverage-clean
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
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_174 = $(mpi_fc_sources)
|
||||
@BUILD_CXX_BINDING_TRUE@am__append_175 = lib/lib@MPICXXLIBNAME@.la
|
||||
@BUILD_OSU_MVAPICH_TRUE@am__append_176 =
|
||||
-@BUILD_OSU_MVAPICH_TRUE@am__append_177 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
|
||||
+@BUILD_OSU_MVAPICH_TRUE@am__append_177 = src/env/mpiname src/util/mv2_ckpt_rebuild
|
||||
@BUILD_OSU_MVAPICH_TRUE@am__append_178 =
|
||||
@BUILD_OSU_MVAPICH_TRUE@am__append_179 = -lhwloc
|
||||
@BUILD_COVERAGE_TRUE@am__append_180 = coverage-clean
|
||||
--
|
||||
2.13.6
|
||||
|
||||
|
|
@ -1,36 +1,9 @@
|
|||
# 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)")}
|
||||
|
||||
%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
|
||||
Version: 2.3
|
||||
Release: 5%{?dist}
|
||||
%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
|
||||
# Richard Fontana wrote in https://bugzilla.redhat.com/show_bug.cgi?id=1333114:
|
||||
|
|
@ -46,20 +19,19 @@ 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
|
||||
BuildRequires: python3-devel, perl-Digest-MD5, hwloc-devel, libibmad-devel
|
||||
BuildRequires: python3-devel, perl-Digest-MD5, hwloc-devel, rdma-core-devel
|
||||
BuildRequires: bison, flex
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
BuildRequires: rpm-mpi-hooks
|
||||
BuildRequires: rpm-mpi-hooks, rdma-core-devel, infiniband-diags-devel
|
||||
%ifarch x86_64
|
||||
BuildRequires: libpsm2-devel >= 10.3.58
|
||||
%endif
|
||||
|
|
@ -119,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
|
||||
|
|
@ -173,16 +144,8 @@ cd psm2
|
|||
--enable-cxx \
|
||||
--disable-silent-rules \
|
||||
--disable-wrapper-rpath \
|
||||
--with-hwloc-prefix=system \
|
||||
--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}"
|
||||
--with-hwloc=v2 \
|
||||
--with-device=ch3:psm
|
||||
|
||||
# Remove rpath, part 2
|
||||
find . -name libtool -exec \
|
||||
|
|
@ -218,15 +181,7 @@ cd default
|
|||
--enable-cxx \
|
||||
--disable-silent-rules \
|
||||
--disable-wrapper-rpath \
|
||||
--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}"
|
||||
--with-hwloc=v2
|
||||
|
||||
# Remove rpath, part 2
|
||||
find . -name libtool -exec \
|
||||
|
|
@ -390,6 +345,37 @@ cd ..
|
|||
|
||||
|
||||
%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
|
||||
- Add BR: rdma-core-devel and infiniband-diags-devel for infiniband/mad.h
|
||||
- Related: rhbz#1708656
|
||||
|
||||
* Tue Nov 19 2019 Jarod Wilson <jarod@redhat.com> 2.3.2-1
|
||||
- Update to upstream stable point release v2.3.2
|
||||
- Resolves: rhbz#1708656
|
||||
|
||||
* Thu Nov 08 2018 Jarod Wilson <jarod@redhat.com> 2.3-5
|
||||
- Add missing Provides: mpi and Requires: environment-modules to base mvapich2 package
|
||||
- Resolves: rhbz#1647177
|
||||
|
|
|
|||
Loading…
Reference in New Issue