import mvapich2-2.3.5-1.el8
This commit is contained in:
parent
eee326a2ce
commit
c42ae08587
|
@ -1 +1 @@
|
|||
SOURCES/mvapich2-2.3.4.tar.gz
|
||||
SOURCES/mvapich2-2.3.5.tar.gz
|
||||
|
|
|
@ -1 +1 @@
|
|||
69537f69c12ab00e694763f12bc59e9010b2cd83 SOURCES/mvapich2-2.3.4.tar.gz
|
||||
4158180718b1703afa76bcea3819eb86b5b355d1 SOURCES/mvapich2-2.3.5.tar.gz
|
||||
|
|
|
@ -1,31 +1,37 @@
|
|||
From ad77173180c4395fab644db9ac5135cd4ea7c12a Mon Sep 17 00:00:00 2001
|
||||
From 88e61b66e821f0f4bda5fed002065093146b352c Mon Sep 17 00:00:00 2001
|
||||
From: Honggang Li <honli@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 01:14:39 -0400
|
||||
Date: Tue, 1 Dec 2020 12:41:55 +0800
|
||||
Subject: [PATCH 1/2] mvapich23: unbundle contrib/hwloc
|
||||
|
||||
Signed-off-by: Honggang Li <honli@redhat.com>
|
||||
---
|
||||
Makefile.in | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
Makefile.in | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index d21f9fe..87273d8 100644
|
||||
index 140d9d8ecd6c..6bbf5f857bad 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -3038,10 +3038,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/hwloc/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
|
||||
@@ -3049,13 +3049,13 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
|
||||
@BUILD_F77_BINDING_TRUE@@BUILD_PROFILING_LIB_TRUE@am__append_183 = -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES
|
||||
@BUILD_F77_BINDING_TRUE@@BUILD_FC_BINDING_TRUE@am__append_184 = $(mpi_fc_sources)
|
||||
@BUILD_CXX_BINDING_TRUE@am__append_185 = lib/lib@MPICXXLIBNAME@.la
|
||||
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_186 = contrib/hwloc_v1
|
||||
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 = contrib/hwloc_v2
|
||||
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_186 =
|
||||
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 =
|
||||
@BUILD_OSU_MVAPICH_TRUE@am__append_188 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
|
||||
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_189 = -Icontrib/hwloc_v1/include/ -I$(top_srcdir)/contrib/hwloc_v1/include
|
||||
-@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 = contrib/hwloc_v1/src/libhwloc_embedded.la
|
||||
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 = -Icontrib/hwloc_v2/include/ -I$(top_srcdir)/contrib/hwloc_v2/include
|
||||
-@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 = contrib/hwloc_v2/hwloc/libhwloc_embedded.la
|
||||
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_189 =
|
||||
+@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 = -lhwloc
|
||||
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 =
|
||||
+@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_192 = -lhwloc
|
||||
@BUILD_COVERAGE_TRUE@am__append_193 = coverage-clean
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
--
|
||||
2.27.0
|
||||
2.25.4
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
From 143423f75b35b4c9c338014231f0350cf949c5e8 Mon Sep 17 00:00:00 2001
|
||||
From 03bc868ca5580f2266d93b2805c79ce97b117767 Mon Sep 17 00:00:00 2001
|
||||
From: Honggang Li <honli@redhat.com>
|
||||
Date: Wed, 24 Jun 2020 01:15:50 -0400
|
||||
Date: Tue, 1 Dec 2020 12:44:12 +0800
|
||||
Subject: [PATCH 2/2] mvapich23: unbundle osu_benchmarks
|
||||
|
||||
Signed-off-by: Honggang Li <honli@redhat.com>
|
||||
|
@ -9,18 +9,18 @@ Signed-off-by: Honggang Li <honli@redhat.com>
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 87273d8..ee1219a 100644
|
||||
index 6bbf5f857bad..500df0988a2f 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -3039,7 +3039,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
|
||||
@@ -3051,7 +3051,7 @@ bin_PROGRAMS = $(am__EXEEXT_1) src/env/mpichversion$(EXEEXT) \
|
||||
@BUILD_CXX_BINDING_TRUE@am__append_185 = lib/lib@MPICXXLIBNAME@.la
|
||||
@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_186 =
|
||||
@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_187 =
|
||||
-@BUILD_OSU_MVAPICH_TRUE@am__append_188 = src/env/mpiname src/util/mv2_ckpt_rebuild osu_benchmarks
|
||||
+@BUILD_OSU_MVAPICH_TRUE@am__append_188 = src/env/mpiname src/util/mv2_ckpt_rebuild
|
||||
@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_189 =
|
||||
@BUILD_HWLOC_v1_TRUE@@BUILD_OSU_MVAPICH_TRUE@am__append_190 = -lhwloc
|
||||
@BUILD_HWLOC_v1_FALSE@@BUILD_OSU_MVAPICH_TRUE@am__append_191 =
|
||||
--
|
||||
2.27.0
|
||||
2.25.4
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
%{!?python3_sitearch: %global python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Name: mvapich2
|
||||
Version: 2.3.4
|
||||
Version: 2.3.5
|
||||
Release: 1%{?dist}
|
||||
Summary: OSU MVAPICH2 MPI package
|
||||
Group: Development/Libraries
|
||||
|
@ -145,6 +145,7 @@ cd psm2
|
|||
--enable-cxx \
|
||||
--disable-silent-rules \
|
||||
--disable-wrapper-rpath \
|
||||
--with-hwloc=v2 \
|
||||
--with-device=ch3:psm
|
||||
|
||||
# Remove rpath, part 2
|
||||
|
@ -180,7 +181,8 @@ cd default
|
|||
--enable-fortran=all \
|
||||
--enable-cxx \
|
||||
--disable-silent-rules \
|
||||
--disable-wrapper-rpath
|
||||
--disable-wrapper-rpath \
|
||||
--with-hwloc=v2
|
||||
|
||||
# Remove rpath, part 2
|
||||
find . -name libtool -exec \
|
||||
|
@ -344,6 +346,10 @@ cd ..
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
|
Loading…
Reference in New Issue