Compare commits
No commits in common. "c8" and "c8-beta" have entirely different histories.
|
|
@ -1 +1 @@
|
|||
SOURCES/mvapich2-2.3.6.tar.gz
|
||||
SOURCES/mvapich2-2.3.7-1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
0cb41a1f58b2e155bac35a44a53e4f29829bef21 SOURCES/mvapich2-2.3.6.tar.gz
|
||||
1672258b9fe58eae02beea1020344fb26a99de7d SOURCES/mvapich2-2.3.7-1.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,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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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 <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
|
||||
|
|
|
|||
Loading…
Reference in New Issue