From 91fddcde5e65072503cca755fecbb1698a1ace7f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Mar 2023 20:00:02 -0700 Subject: [PATCH 01/35] Update to 4.1; Switch to default ch4:ofi device --- .gitignore | 1 + ...-e.g.-specs.-and-lto-from-mpi-wrappe.patch | 111 +++++++----------- 6374.patch | 38 ------ mpich-aclocal_cc-implicit-int.patch | 71 +++-------- mpich.spec | 13 +- sources | 2 +- 6 files changed, 65 insertions(+), 171 deletions(-) delete mode 100644 6374.patch diff --git a/.gitignore b/.gitignore index 2a4f638..8492009 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /mpich-3.4.1.tar.gz /mpich-4.0.2.tar.gz /mpich-4.0.3.tar.gz +/mpich-4.1.tar.gz diff --git a/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch b/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch index 613d7c4..487f1c5 100644 --- a/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch +++ b/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch @@ -1,145 +1,118 @@ -From e4f0e86f815d8bd3dbb7cccf660bae6ab7f302dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sun, 10 Apr 2022 09:35:14 +0200 -Subject: [PATCH 3/4] Drop build flags, e.g. -specs... and -lto from mpi +From 030214c7084cf5aaf4372147f48343b9915ca743 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 1 Mar 2023 19:24:41 -0700 +Subject: [PATCH 3/3] Drop build flags, e.g. -specs... and -lto from mpi wrappers (mpicc and mpicxx) For discussion see: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/7TFWEKTDWBYBHEGMIWBVI3AVGORZGNBS/ --- - src/env/mpicc.bash.in | 8 ++++---- - src/env/mpicc.sh.in | 8 ++++---- - src/env/mpicxx.bash.in | 8 ++++---- - src/env/mpicxx.sh.in | 8 ++++---- - src/env/mpifort.bash.in | 6 +++--- - src/env/mpifort.sh.in | 6 +++--- - 6 files changed, 22 insertions(+), 22 deletions(-) + src/env/mpicc.bash.in | 6 +++--- + src/env/mpicc.sh.in | 6 +++--- + src/env/mpicxx.bash.in | 6 +++--- + src/env/mpicxx.sh.in | 6 +++--- + src/env/mpifort.bash.in | 4 ++-- + src/env/mpifort.sh.in | 4 ++-- + 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in -index 56d2dcb242..933ee22bf0 100644 +index 3fc695f..f31e436 100644 --- a/src/env/mpicc.bash.in +++ b/src/env/mpicc.bash.in -@@ -247,13 +247,13 @@ if [ -n "$profConf" ] ; then +@@ -247,9 +247,9 @@ if [ -n "$profConf" ] ; then fi fi -final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@" -final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@" -+final_cflags="@MPICH_MPICC_CFLAGS@ " -+final_cppflags="@MPICH_MPICC_CPPFLAGS@ " -+final_ldflags="@MPICH_MPICC_LDFLAGS@ " ++final_cflags="@MPICH_MPICC_CFLAGS@" ++final_cppflags="@MPICH_MPICC_CPPFLAGS@" ++final_ldflags="@MPICH_MPICC_LDFLAGS@" final_libs="@MPICH_MPICC_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" -- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" -+ final_libs="${final_libs} @LIBS@ " - fi - - # ----------------------------------------------------------------------- diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in -index 654131528e..4ebdc8b6ef 100644 +index 99a8c90..89ef111 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in -@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then +@@ -253,9 +253,9 @@ if [ -n "$profConf" ] ; then fi fi -final_cflags="@MPICH_MPICC_CFLAGS@ @WRAPPER_CFLAGS@" -final_cppflags="@MPICH_MPICC_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICC_LDFLAGS@ @WRAPPER_LDFLAGS@" -+final_cflags="@MPICH_MPICC_CFLAGS@ " -+final_cppflags="@MPICH_MPICC_CPPFLAGS@ " -+final_ldflags="@MPICH_MPICC_LDFLAGS@ " ++final_cflags="@MPICH_MPICC_CFLAGS@" ++final_cppflags="@MPICH_MPICC_CPPFLAGS@" ++final_ldflags="@MPICH_MPICC_LDFLAGS@" final_libs="@MPICH_MPICC_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" -- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" -+ final_libs="${final_libs} @LIBS@ " - fi - - # ----------------------------------------------------------------------- diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in -index 10d11e3fba..4066bb46f2 100644 +index 29566ba..f80882e 100644 --- a/src/env/mpicxx.bash.in +++ b/src/env/mpicxx.bash.in -@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then +@@ -253,9 +253,9 @@ if [ -n "$profConf" ] ; then fi fi -final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@" -final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@" -+final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ " -+final_cppflags="@MPICH_MPICXX_CPPFLAGS@ " -+final_ldflags="@MPICH_MPICXX_LDFLAGS@ " ++final_cxxflags="@MPICH_MPICXX_CXXFLAGS@" ++final_cppflags="@MPICH_MPICXX_CPPFLAGS@" ++final_ldflags="@MPICH_MPICXX_LDFLAGS@" final_libs="@MPICH_MPICXX_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" -- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" -+ final_libs="${final_libs} @LIBS@ " - fi - - # A temporary statement to invoke the compiler diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in -index 1c0078100f..2c090cb06c 100644 +index 0b830fe..32dab65 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in -@@ -259,13 +259,13 @@ if [ -n "$profConf" ] ; then +@@ -259,9 +259,9 @@ if [ -n "$profConf" ] ; then fi fi -final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ @WRAPPER_CXXFLAGS@" -final_cppflags="@MPICH_MPICXX_CPPFLAGS@ @WRAPPER_CPPFLAGS@" -final_ldflags="@MPICH_MPICXX_LDFLAGS@ @WRAPPER_LDFLAGS@" -+final_cxxflags="@MPICH_MPICXX_CXXFLAGS@ " -+final_cppflags="@MPICH_MPICXX_CPPFLAGS@ " -+final_ldflags="@MPICH_MPICXX_LDFLAGS@ " ++final_cxxflags="@MPICH_MPICXX_CXXFLAGS@" ++final_cppflags="@MPICH_MPICXX_CPPFLAGS@" ++final_ldflags="@MPICH_MPICXX_LDFLAGS@" final_libs="@MPICH_MPICXX_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" -- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" -+ final_libs="${final_libs} @LIBS@ " - fi - - # A temporary statement to invoke the compiler diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in -index 1130c57986..91a6cb56c5 100644 +index 5312aea..2322b4f 100644 --- a/src/env/mpifort.bash.in +++ b/src/env/mpifort.bash.in -@@ -335,12 +335,12 @@ elif [ -n "$FCMODINC" ] ; then +@@ -335,8 +335,8 @@ elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" fi -final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@" -final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@" -+final_fcflags="@MPICH_MPIFORT_FCFLAGS@ " -+final_ldflags="@MPICH_MPIFORT_LDFLAGS@ " ++final_fcflags="@MPICH_MPIFORT_FCFLAGS@" ++final_ldflags="@MPICH_MPIFORT_LDFLAGS@" final_libs="@MPICH_MPIFORT_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" -- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" -+ final_libs="${final_libs} @LIBS@ " - fi - - # A temporary statement to invoke the compiler diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in -index a1e7f4dd8e..9d89a8bbe7 100644 +index 902b0f7..665fe85 100644 --- a/src/env/mpifort.sh.in +++ b/src/env/mpifort.sh.in -@@ -352,12 +352,12 @@ elif [ -n "$FCMODINC" ] ; then +@@ -352,8 +352,8 @@ elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" fi -final_fcflags="@MPICH_MPIFORT_FCFLAGS@ @WRAPPER_FCFLAGS@" -final_ldflags="@MPICH_MPIFORT_LDFLAGS@ @WRAPPER_LDFLAGS@" -+final_fcflags="@MPICH_MPIFORT_FCFLAGS@ " -+final_ldflags="@MPICH_MPIFORT_LDFLAGS@ " ++final_fcflags="@MPICH_MPIFORT_FCFLAGS@" ++final_ldflags="@MPICH_MPIFORT_LDFLAGS@" final_libs="@MPICH_MPIFORT_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" -- final_libs="${final_libs} @LIBS@ @WRAPPER_LIBS@" -+ final_libs="${final_libs} @LIBS@ " - fi - - # A temporary statement to invoke the compiler +-- +2.39.2 + diff --git a/6374.patch b/6374.patch deleted file mode 100644 index 9471ae6..0000000 --- a/6374.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2b8c5c7dc4974fc471b446e6cc939936aa14fd8f Mon Sep 17 00:00:00 2001 -From: Hui Zhou -Date: Sat, 21 Jan 2023 10:35:32 -0600 -Subject: [PATCH] coll: fix allgatherv early return case - -The localcopy omitted considering displs. ---- - src/binding/c/coll_api.txt | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/binding/c/coll_api.txt b/src/binding/c/coll_api.txt -index 55be70d093e..d288272e2f3 100644 ---- a/src/binding/c/coll_api.txt -+++ b/src/binding/c/coll_api.txt -@@ -57,7 +57,10 @@ MPI_Allgatherv: - { -- early_return -- - if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && MPIR_Comm_size(comm_ptr) == 1) { - if (sendbuf != MPI_IN_PLACE) { -- MPIR_Localcopy(sendbuf, sendcount, sendtype, recvbuf, recvcounts[0], recvtype); -+ MPI_Aint recvtype_extent; -+ MPIR_Datatype_get_extent_macro(recvtype, recvtype_extent); -+ MPIR_Localcopy(sendbuf, sendcount, sendtype, -+ (char *) recvbuf + displs[0] * recvtype_extent, recvcounts[0], recvtype); - } - goto fn_exit; - } -@@ -188,7 +191,10 @@ MPI_Iallgatherv: - { -- early_return -- - if (comm_ptr->comm_kind == MPIR_COMM_KIND__INTRACOMM && MPIR_Comm_size(comm_ptr) == 1) { - if (sendbuf != MPI_IN_PLACE) { -- MPIR_Localcopy(sendbuf, sendcount, sendtype, recvbuf, recvcounts[0], recvtype); -+ MPI_Aint recvtype_extent; -+ MPIR_Datatype_get_extent_macro(recvtype, recvtype_extent); -+ MPIR_Localcopy(sendbuf, sendcount, sendtype, -+ (char *) recvbuf + displs[0] * recvtype_extent, recvcounts[0], recvtype); - } - MPIR_Request *request_ptr = MPIR_Request_create_complete(MPIR_REQUEST_KIND__COLL); - *request = request_ptr->handle; diff --git a/mpich-aclocal_cc-implicit-int.patch b/mpich-aclocal_cc-implicit-int.patch index 2f6ec43..e093283 100644 --- a/mpich-aclocal_cc-implicit-int.patch +++ b/mpich-aclocal_cc-implicit-int.patch @@ -6,10 +6,10 @@ revision. Submitted upstream: diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/confdb/aclocal_cc.m4 +++ b/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); @@ -19,7 +19,7 @@ index 36b44216d36dd8db..cafb5a6ae137f750 100644 extern int PFoo(int), PFoo_(int), pfoo_(int); int main() { diff --git a/modules/json-c/autoconf-archive/m4/aclocal_cc.m4 b/modules/json-c/autoconf-archive/m4/aclocal_cc.m4 -index 8a1552d561306f24..cd28a4f937eaf824 100644 +index 8a1552d..cd28a4f 100644 --- a/modules/json-c/autoconf-archive/m4/aclocal_cc.m4 +++ b/modules/json-c/autoconf-archive/m4/aclocal_cc.m4 @@ -383,7 +383,7 @@ extern int pfoo_(int); @@ -32,7 +32,7 @@ index 8a1552d561306f24..cd28a4f937eaf824 100644 ],[ AC_LANG_SOURCE([ diff --git a/modules/yaksa/m4/aclocal_cc.m4 b/modules/yaksa/m4/aclocal_cc.m4 -index d15d6741602daf07..9fcf48527653ff01 100644 +index d15d674..9fcf485 100644 --- a/modules/yaksa/m4/aclocal_cc.m4 +++ b/modules/yaksa/m4/aclocal_cc.m4 @@ -422,7 +422,7 @@ extern int pfoo_(int); @@ -45,10 +45,10 @@ index d15d6741602daf07..9fcf48527653ff01 100644 ],[ AC_LANG_SOURCE([ diff --git a/src/mpi/romio/confdb/aclocal_cc.m4 b/src/mpi/romio/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/src/mpi/romio/confdb/aclocal_cc.m4 +++ b/src/mpi/romio/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); @@ -58,10 +58,10 @@ index 36b44216d36dd8db..cafb5a6ae137f750 100644 extern int PFoo(int), PFoo_(int), pfoo_(int); int main() { diff --git a/src/mpi/romio/mpl/confdb/aclocal_cc.m4 b/src/mpi/romio/mpl/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/src/mpi/romio/mpl/confdb/aclocal_cc.m4 +++ b/src/mpi/romio/mpl/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); @@ -71,10 +71,10 @@ index 36b44216d36dd8db..cafb5a6ae137f750 100644 extern int PFoo(int), PFoo_(int), pfoo_(int); int main() { diff --git a/src/mpl/confdb/aclocal_cc.m4 b/src/mpl/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/src/mpl/confdb/aclocal_cc.m4 +++ b/src/mpl/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); @@ -84,49 +84,10 @@ index 36b44216d36dd8db..cafb5a6ae137f750 100644 extern int PFoo(int), PFoo_(int), pfoo_(int); int main() { diff --git a/src/pm/hydra/confdb/aclocal_cc.m4 b/src/pm/hydra/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/src/pm/hydra/confdb/aclocal_cc.m4 +++ b/src/pm/hydra/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s - #pragma weak PFoo_ = Foo - #pragma weak pfoo_ = Foo - int Foo(int); -- int Foo(a) { return a; } -+ int Foo(int a) { return a; } - ]])],[AC_LANG_SOURCE([[ - extern int PFoo(int), PFoo_(int), pfoo_(int); - int main() { -diff --git a/src/pm/hydra/mpl/confdb/aclocal_cc.m4 b/src/pm/hydra/mpl/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 ---- a/src/pm/hydra/mpl/confdb/aclocal_cc.m4 -+++ b/src/pm/hydra/mpl/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s - #pragma weak PFoo_ = Foo - #pragma weak pfoo_ = Foo - int Foo(int); -- int Foo(a) { return a; } -+ int Foo(int a) { return a; } - ]])],[AC_LANG_SOURCE([[ - extern int PFoo(int), PFoo_(int), pfoo_(int); - int main() { -diff --git a/src/pm/hydra2/confdb/aclocal_cc.m4 b/src/pm/hydra2/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 ---- a/src/pm/hydra2/confdb/aclocal_cc.m4 -+++ b/src/pm/hydra2/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s - #pragma weak PFoo_ = Foo - #pragma weak pfoo_ = Foo - int Foo(int); -- int Foo(a) { return a; } -+ int Foo(int a) { return a; } - ]])],[AC_LANG_SOURCE([[ - extern int PFoo(int), PFoo_(int), pfoo_(int); - int main() { -diff --git a/src/pm/hydra2/mpl/confdb/aclocal_cc.m4 b/src/pm/hydra2/mpl/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 ---- a/src/pm/hydra2/mpl/confdb/aclocal_cc.m4 -+++ b/src/pm/hydra2/mpl/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); @@ -136,10 +97,10 @@ index 36b44216d36dd8db..cafb5a6ae137f750 100644 extern int PFoo(int), PFoo_(int), pfoo_(int); int main() { diff --git a/test/mpi/confdb/aclocal_cc.m4 b/test/mpi/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/test/mpi/confdb/aclocal_cc.m4 +++ b/test/mpi/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); @@ -149,10 +110,10 @@ index 36b44216d36dd8db..cafb5a6ae137f750 100644 extern int PFoo(int), PFoo_(int), pfoo_(int); int main() { diff --git a/test/mpi/dtpools/confdb/aclocal_cc.m4 b/test/mpi/dtpools/confdb/aclocal_cc.m4 -index 36b44216d36dd8db..cafb5a6ae137f750 100644 +index a85e082..2710ada 100644 --- a/test/mpi/dtpools/confdb/aclocal_cc.m4 +++ b/test/mpi/dtpools/confdb/aclocal_cc.m4 -@@ -388,7 +388,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s +@@ -381,7 +381,7 @@ AC_CACHE_CHECK([for multiple weak symbol support], pac_cv_prog_c_multiple_weak_s #pragma weak PFoo_ = Foo #pragma weak pfoo_ = Foo int Foo(int); diff --git a/mpich.spec b/mpich.spec index 64f58d2..357569e 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,6 +1,6 @@ Summary: A high-performance implementation of MPI Name: mpich -Version: 4.0.3 +Version: 4.1 Release: %autorelease License: MIT URL: https://www.mpich.org/ @@ -14,8 +14,6 @@ Patch: 0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch Patch: 0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch Patch: 0004-Make-mpich.module-useful.patch # TODO: submit ^ upstream -# https://github.com/pmodels/mpich/pull/6374 -Patch: 6374.patch Patch: mpich-configure-max_align_t.patch Patch: mpich-aclocal_cc-implicit-int.patch @@ -127,9 +125,7 @@ CONFIGURE_OPTS=( --enable-lib-depend --disable-rpath --disable-silent-rules - --enable-fortran --with-gnu-ld - --with-device=ch3:nemesis --with-pm=hydra:gforker --includedir=%{_includedir}/%{name}-%{_arch} --bindir=%{_libdir}/%{name}/bin @@ -138,10 +134,11 @@ CONFIGURE_OPTS=( --mandir=%{_mandir}/%{name}-%{_arch} --docdir=%{_datadir}/%{name}/doc --htmldir=%{_datadir}/%{name}/doc - --with-hwloc-prefix=system - --with-libfabric=system - --with-ucx=system + --with-hwloc + --with-libfabric + --with-ucx ) +# --with-device=ch3:nemesis # Set -fallow-argument-mismatch for #1795817 %configure "${CONFIGURE_OPTS[@]}" \ diff --git a/sources b/sources index e4fb767..040a2f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpich-4.0.3.tar.gz) = d1463dca8f0073cee6a2db894dbb3889986c6ee6353577f778abc38c90a06afb960e3dbbe87d3c2f284e32650b723a153a143f10b32e4a3bfe6087682ffe9649 +SHA512 (mpich-4.1.tar.gz) = 950d27d8b6e2e58971312eb98cc263860f024a34a6e61dcf0fa5ff0156e8089ba268e25ee8f602aadd748fe066481b81e3442a296e54af3aea829f43b7b5f1bf From c0375f1c3cb50d0bc725525d5a1083ea62dccb97 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Mar 2023 21:39:30 -0700 Subject: [PATCH 02/35] Use ucx only on supported arches --- mpich.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mpich.spec b/mpich.spec index 357569e..77d4e1a 100644 --- a/mpich.spec +++ b/mpich.spec @@ -136,7 +136,9 @@ CONFIGURE_OPTS=( --htmldir=%{_datadir}/%{name}/doc --with-hwloc --with-libfabric +%ifarch aarch64 ppc64le x86_64 --with-ucx +%endif ) # --with-device=ch3:nemesis From 4fc868d26c1e93f24637ff44de0678643e2e5fed Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 1 Mar 2023 21:41:06 -0700 Subject: [PATCH 03/35] Add various BuildRequires to fix build [skip changelog] --- mpich.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mpich.spec b/mpich.spec index 77d4e1a..3de41d7 100644 --- a/mpich.spec +++ b/mpich.spec @@ -27,7 +27,14 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: hwloc-devel >= 2.0 +%ifarch x86_64 +BuildRequires: infinipath-psm-devel +BuildRequires: libpsm2-devel +%endif BuildRequires: libfabric-devel +BuildRequires: libnl3-devel +BuildRequires: libuuid-devel +BuildRequires: numactl-devel %ifarch aarch64 ppc64le x86_64 BuildRequires: ucx-devel %endif From dbc72d62d31dffb330caac5d5562fd360715ad79 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 2 Mar 2023 17:56:27 -0700 Subject: [PATCH 04/35] Remove dependency libs from wrappers --- ...ptimization-and-link-flags-from-pkgc.patch | 2 +- ...o-drop-rpath-flags-from-pkgconf-file.patch | 4 +- ...-e.g.-specs.-and-lto-from-mpi-wrappe.patch | 74 +++++++++++++------ 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch b/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch index 5a9b7b8..2fbee32 100644 --- a/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch +++ b/0001-pkgconf-remove-optimization-and-link-flags-from-pkgc.patch @@ -30,7 +30,7 @@ index e905ff2e20..ff6dc35807 100644 Requires: -Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@ -Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} -+Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@ ++Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ +Cflags: @WRAPPER_CPPFLAGS@ -I${includedir} # pkg-config does not understand Cxxflags, etc. So we allow users to diff --git a/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch b/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch index af7828c..46e6c13 100644 --- a/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch +++ b/0002-pkgconf-also-drop-rpath-flags-from-pkgconf-file.patch @@ -18,8 +18,8 @@ index ff6dc35807..5ad7e8bcbc 100644 Version: @MPICH_VERSION@ URL: http://www.mcs.anl.gov/research/projects/mpich Requires: --Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@ -+Libs: -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@ +-Libs: @WRAPPER_C_DYNAMIC_LOADING_FLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ ++Libs: -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ Cflags: @WRAPPER_CPPFLAGS@ -I${includedir} # pkg-config does not understand Cxxflags, etc. So we allow users to diff --git a/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch b/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch index 487f1c5..ad427f7 100644 --- a/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch +++ b/0003-Drop-build-flags-e.g.-specs.-and-lto-from-mpi-wrappe.patch @@ -1,25 +1,25 @@ -From 030214c7084cf5aaf4372147f48343b9915ca743 Mon Sep 17 00:00:00 2001 +From 695102787fde0b3adb3917b12b97f8c49f7f57a5 Mon Sep 17 00:00:00 2001 From: rpm-build -Date: Wed, 1 Mar 2023 19:24:41 -0700 +Date: Thu, 2 Mar 2023 17:50:52 -0700 Subject: [PATCH 3/3] Drop build flags, e.g. -specs... and -lto from mpi wrappers (mpicc and mpicxx) For discussion see: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/7TFWEKTDWBYBHEGMIWBVI3AVGORZGNBS/ --- - src/env/mpicc.bash.in | 6 +++--- - src/env/mpicc.sh.in | 6 +++--- - src/env/mpicxx.bash.in | 6 +++--- - src/env/mpicxx.sh.in | 6 +++--- - src/env/mpifort.bash.in | 4 ++-- - src/env/mpifort.sh.in | 4 ++-- - 6 files changed, 16 insertions(+), 16 deletions(-) + src/env/mpicc.bash.in | 8 ++++---- + src/env/mpicc.sh.in | 8 ++++---- + src/env/mpicxx.bash.in | 8 ++++---- + src/env/mpicxx.sh.in | 8 ++++---- + src/env/mpifort.bash.in | 6 +++--- + src/env/mpifort.sh.in | 6 +++--- + 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in -index 3fc695f..f31e436 100644 +index 3fc695f..d8659e5 100644 --- a/src/env/mpicc.bash.in +++ b/src/env/mpicc.bash.in -@@ -247,9 +247,9 @@ if [ -n "$profConf" ] ; then +@@ -247,13 +247,13 @@ if [ -n "$profConf" ] ; then fi fi @@ -32,11 +32,16 @@ index 3fc695f..f31e436 100644 final_libs="@MPICH_MPICC_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" +- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__" ++ final_libs="${final_libs}" + fi + + # ----------------------------------------------------------------------- diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in -index 99a8c90..89ef111 100644 +index 99a8c90..e093907 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in -@@ -253,9 +253,9 @@ if [ -n "$profConf" ] ; then +@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then fi fi @@ -49,11 +54,16 @@ index 99a8c90..89ef111 100644 final_libs="@MPICH_MPICC_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" +- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__" ++ final_libs="${final_libs}" + fi + + # ----------------------------------------------------------------------- diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in -index 29566ba..f80882e 100644 +index 29566ba..acf897b 100644 --- a/src/env/mpicxx.bash.in +++ b/src/env/mpicxx.bash.in -@@ -253,9 +253,9 @@ if [ -n "$profConf" ] ; then +@@ -253,13 +253,13 @@ if [ -n "$profConf" ] ; then fi fi @@ -66,11 +76,16 @@ index 29566ba..f80882e 100644 final_libs="@MPICH_MPICXX_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" +- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__" ++ final_libs="${final_libs}" + fi + + # A temporary statement to invoke the compiler diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in -index 0b830fe..32dab65 100644 +index 0b830fe..36c2486 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in -@@ -259,9 +259,9 @@ if [ -n "$profConf" ] ; then +@@ -259,13 +259,13 @@ if [ -n "$profConf" ] ; then fi fi @@ -83,11 +98,16 @@ index 0b830fe..32dab65 100644 final_libs="@MPICH_MPICXX_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" +- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__" ++ final_libs="${final_libs}" + fi + + # A temporary statement to invoke the compiler diff --git a/src/env/mpifort.bash.in b/src/env/mpifort.bash.in -index 5312aea..2322b4f 100644 +index 5312aea..c1e557b 100644 --- a/src/env/mpifort.bash.in +++ b/src/env/mpifort.bash.in -@@ -335,8 +335,8 @@ elif [ -n "$FCMODINC" ] ; then +@@ -335,12 +335,12 @@ elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" fi @@ -98,11 +118,16 @@ index 5312aea..2322b4f 100644 final_libs="@MPICH_MPIFORT_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" +- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__" ++ final_libs="${final_libs}" + fi + + extra_f77_flags="@WRAPPER_EXTRA_F77_FLAGS@" diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in -index 902b0f7..665fe85 100644 +index 902b0f7..95c1232 100644 --- a/src/env/mpifort.sh.in +++ b/src/env/mpifort.sh.in -@@ -352,8 +352,8 @@ elif [ -n "$FCMODINC" ] ; then +@@ -352,12 +352,12 @@ elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" fi @@ -113,6 +138,11 @@ index 902b0f7..665fe85 100644 final_libs="@MPICH_MPIFORT_LIBS@" if test "@INTERLIB_DEPS@" = "no" -o "${interlib_deps}" = "no" ; then final_ldflags="${final_ldflags} @LDFLAGS@" +- final_libs="${final_libs} __LIBS_TO_BE_FILLED_AT_INSTALL_TIME__" ++ final_libs="${final_libs}" + fi + + extra_f77_flags="@WRAPPER_EXTRA_F77_FLAGS@" -- -2.39.2 +2.40.0.rc1 From 2839aa2847e8467ec593b2425c37ef5ef8f884f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 20 May 2023 18:38:27 +0200 Subject: [PATCH 05/35] Version 4.4.1 ... (rhbz#2082757) --- .gitignore | 1 + mpich.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8492009..cea23a1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /mpich-4.0.2.tar.gz /mpich-4.0.3.tar.gz /mpich-4.1.tar.gz +/mpich-4.1.1.tar.gz diff --git a/mpich.spec b/mpich.spec index 3de41d7..5e34280 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,6 +1,6 @@ Summary: A high-performance implementation of MPI Name: mpich -Version: 4.1 +Version: 4.1.1 Release: %autorelease License: MIT URL: https://www.mpich.org/ diff --git a/sources b/sources index 040a2f2..7775d0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpich-4.1.tar.gz) = 950d27d8b6e2e58971312eb98cc263860f024a34a6e61dcf0fa5ff0156e8089ba268e25ee8f602aadd748fe066481b81e3442a296e54af3aea829f43b7b5f1bf +SHA512 (mpich-4.1.1.tar.gz) = 9a0920c5f412e15be0b94aba8750175fb49c4f60463a4290a9ca0aa24af425a720bf546ec7f2b9aa1b5d530f065310f5c4ec85aadfda6355d8039b13ca3718ee From 45b47a9032c668b0efcd1df0f633243df87a1021 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:22:53 +0200 Subject: [PATCH 06/35] Rebuilt for Python 3.12 From c44d61cb86643e5c167b8078cadf3d76df1e5f68 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 9 Jul 2023 22:40:45 -0400 Subject: [PATCH 07/35] Disable PSM, PSM2 in ELN builds Development of these hardware has ceased, and these packages are unwanted in RHEL 10. --- mpich.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mpich.spec b/mpich.spec index 5e34280..9331a7e 100644 --- a/mpich.spec +++ b/mpich.spec @@ -27,10 +27,12 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: hwloc-devel >= 2.0 +%if ! (0%{?rhel} >= 10) %ifarch x86_64 BuildRequires: infinipath-psm-devel BuildRequires: libpsm2-devel %endif +%endif BuildRequires: libfabric-devel BuildRequires: libnl3-devel BuildRequires: libuuid-devel From 6e33991713a4907ff966b6bb6a87c920bcec41d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 18 Jul 2023 10:02:52 +0200 Subject: [PATCH 08/35] Version 4.1.2 ... (rhbz#2213689) --- .gitignore | 1 + mpich.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cea23a1..2c227e7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /mpich-4.0.3.tar.gz /mpich-4.1.tar.gz /mpich-4.1.1.tar.gz +/mpich-4.1.2.tar.gz diff --git a/mpich.spec b/mpich.spec index 9331a7e..701d49b 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,6 +1,6 @@ Summary: A high-performance implementation of MPI Name: mpich -Version: 4.1.1 +Version: 4.1.2 Release: %autorelease License: MIT URL: https://www.mpich.org/ diff --git a/sources b/sources index 7775d0e..9eceb11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpich-4.1.1.tar.gz) = 9a0920c5f412e15be0b94aba8750175fb49c4f60463a4290a9ca0aa24af425a720bf546ec7f2b9aa1b5d530f065310f5c4ec85aadfda6355d8039b13ca3718ee +SHA512 (mpich-4.1.2.tar.gz) = d1056374ef9ecb6d7816637b6709497e5bc63c3b0af8dfef461aa71a59f9f805b07d80a735eb1511748e78a9260ed967b0597e64a935850fcba1dfef7bf43775 From a5d67cc1e4720fd23a48a83b856d8a5e00fb8fb2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:54:26 +0000 Subject: [PATCH 09/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 03ee7f4b2ba98ba9836db3fa6d07fec5f9419363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 31 Jul 2023 08:40:01 +0200 Subject: [PATCH 10/35] Use separate yaksa I made a new package for yaksa, but forgot to make use of it mpich :( --- mpich.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mpich.spec b/mpich.spec index 701d49b..c4e62d9 100644 --- a/mpich.spec +++ b/mpich.spec @@ -30,6 +30,7 @@ BuildRequires: hwloc-devel >= 2.0 %if ! (0%{?rhel} >= 10) %ifarch x86_64 BuildRequires: infinipath-psm-devel +BuildRequires: json-c-devel BuildRequires: libpsm2-devel %endif %endif @@ -40,6 +41,7 @@ BuildRequires: numactl-devel %ifarch aarch64 ppc64le x86_64 BuildRequires: ucx-devel %endif +BuildRequires: yaksa-devel # For ./maint/extractcvars BuildRequires: perl(lib) %ifnarch s390 %{mips} @@ -134,6 +136,7 @@ CONFIGURE_OPTS=( --enable-lib-depend --disable-rpath --disable-silent-rules + --disable-dependency-tracking --with-gnu-ld --with-pm=hydra:gforker --includedir=%{_includedir}/%{name}-%{_arch} @@ -148,6 +151,7 @@ CONFIGURE_OPTS=( %ifarch aarch64 ppc64le x86_64 --with-ucx %endif + --with-yaksa ) # --with-device=ch3:nemesis From 9d70e9040b8c11ca85a8b3e0285aed7ee2eb38ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 31 Jul 2023 09:24:32 +0200 Subject: [PATCH 11/35] Comment out unused build dependency I committed this not as a comment by mistake. There seems to be no provision to not use the bundled copy. The comment shall serve as a reminder. [skip changelog] --- mpich.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpich.spec b/mpich.spec index c4e62d9..b0269f0 100644 --- a/mpich.spec +++ b/mpich.spec @@ -30,7 +30,7 @@ BuildRequires: hwloc-devel >= 2.0 %if ! (0%{?rhel} >= 10) %ifarch x86_64 BuildRequires: infinipath-psm-devel -BuildRequires: json-c-devel +# BuildRequires: json-c-devel BuildRequires: libpsm2-devel %endif %endif From e983f61ee7a096a9f847805276b531201f563dd4 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 31 Jul 2023 19:20:48 -0400 Subject: [PATCH 12/35] Use bundled yaksa in RHEL builds --- mpich.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mpich.spec b/mpich.spec index b0269f0..15e285c 100644 --- a/mpich.spec +++ b/mpich.spec @@ -41,7 +41,11 @@ BuildRequires: numactl-devel %ifarch aarch64 ppc64le x86_64 BuildRequires: ucx-devel %endif +%if ! 0%{?rhel} BuildRequires: yaksa-devel +%else +Provides: bundled(yaksa) = 0.2 +%endif # For ./maint/extractcvars BuildRequires: perl(lib) %ifnarch s390 %{mips} @@ -151,7 +155,9 @@ CONFIGURE_OPTS=( %ifarch aarch64 ppc64le x86_64 --with-ucx %endif +%if ! 0%{?rhel} --with-yaksa +%endif ) # --with-device=ch3:nemesis From a862bd18913885286f1a77fdb765e18e65c47245 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Fri, 29 Sep 2023 06:43:44 +0000 Subject: [PATCH 13/35] Mpich should own cmake and include install directories Make sure that packages which install cmake and include files in Mpich locations do not need to own the main directories for Mpich. --- mpich.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mpich.spec b/mpich.spec index 15e285c..2c4c454 100644 --- a/mpich.spec +++ b/mpich.spec @@ -232,6 +232,8 @@ make check VERBOSE=1 \ %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/lib %dir %{_libdir}/%{name}/bin +%dir %{_libdir}/%{name}/lib/cmake +%dir %{_libdir}/%{name}/include %{_libdir}/%{name}/lib/*.so.* %{_libdir}/%{name}/bin/hydra* %{_libdir}/%{name}/bin/mpichversion From de1cf4c29ae0ddc01250a84da24998ee3afe1b30 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Sat, 30 Sep 2023 04:17:34 +0000 Subject: [PATCH 14/35] Create directories for MPICH package development files --- mpich.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mpich.spec b/mpich.spec index 2c4c454..6b2e8f1 100644 --- a/mpich.spec +++ b/mpich.spec @@ -212,6 +212,10 @@ install -pDm0644 %{SOURCE3} %{buildroot}%{python3_sitearch}/%{name}.pth # Create cmake directory mkdir -p %{buildroot}%{_libdir}/%{name}/lib/cmake/ +# Create directories for MPICH application development files +mkdir -p %{buildroot}%{_libdir}/%{name}/lib/cmake +mkdir -p %{buildroot}%{_libdir}/%{name}/include + find %{buildroot} -type f -name "*.la" -delete %check From 362681d20cd2ba5e7fe60115a1231ad0d3c40902 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Tue, 10 Oct 2023 07:51:47 +0000 Subject: [PATCH 15/35] Own %{_fmoddir}/mpich --- mpich.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mpich.spec b/mpich.spec index 6b2e8f1..f5482d4 100644 --- a/mpich.spec +++ b/mpich.spec @@ -238,6 +238,7 @@ make check VERBOSE=1 \ %dir %{_libdir}/%{name}/bin %dir %{_libdir}/%{name}/lib/cmake %dir %{_libdir}/%{name}/include +%dir %{_fmoddir}/mpich %{_libdir}/%{name}/lib/*.so.* %{_libdir}/%{name}/bin/hydra* %{_libdir}/%{name}/bin/mpichversion From 36b1aa0853ed7d99e63b902d13160c8a33d60858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 21 Nov 2023 16:31:23 +0100 Subject: [PATCH 16/35] Convert license tag to SPDX --- mpich.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpich.spec b/mpich.spec index f5482d4..794705c 100644 --- a/mpich.spec +++ b/mpich.spec @@ -2,7 +2,7 @@ Summary: A high-performance implementation of MPI Name: mpich Version: 4.1.2 Release: %autorelease -License: MIT +License: mpich2 URL: https://www.mpich.org/ Source0: https://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz From b5e91d9014f374af9560b08d3980a5d9aaf88d8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:45:25 +0000 Subject: [PATCH 17/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From de301eb66b93215af62c731ee9352553b3134d1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:12:06 +0000 Subject: [PATCH 18/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 66f0030ea866f58a6499ce6bfb24dd201f57529b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 29 Jan 2024 14:43:42 +0100 Subject: [PATCH 19/35] Drop dependency on ftbfs infinipath-psm --- mpich.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mpich.spec b/mpich.spec index 794705c..cde3af5 100644 --- a/mpich.spec +++ b/mpich.spec @@ -29,7 +29,6 @@ BuildRequires: gcc-gfortran BuildRequires: hwloc-devel >= 2.0 %if ! (0%{?rhel} >= 10) %ifarch x86_64 -BuildRequires: infinipath-psm-devel # BuildRequires: json-c-devel BuildRequires: libpsm2-devel %endif From a9297c32c665a5c9fe53100a78135b290a8bbb2f Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 12 Oct 2023 10:19:22 +0200 Subject: [PATCH 20/35] Added CMAKE_PREFIX_PATH to the module file ... to unsure that CMake projects find the available MPI enabled packages, libraries, executables, etc. The motivation is that CMake projects will search first in the CMAKE_PREFIX_PATH, both for cmake specific files like Config.cmake as well as libraries and header files in general. Adding this variable is crucial to making sure that the MPI versions take precedence over the serial versions. --- 0004-Make-mpich.module-useful.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/0004-Make-mpich.module-useful.patch b/0004-Make-mpich.module-useful.patch index 2d5d1ea..ac2a39d 100644 --- a/0004-Make-mpich.module-useful.patch +++ b/0004-Make-mpich.module-useful.patch @@ -42,3 +42,4 @@ index 3d6b4fa623..b8283274ee 100644 +prepend-path LD_LIBRARY_PATH @libdir@ +prepend-path MANPATH :@mandir@ +prepend-path PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig ++prepend-path CMAKE_PREFIX_PATH @LIBDIR@ From 8ab714f2c67838aab53c0b9c5f87396b2ca33c46 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 10 Nov 2023 10:24:59 +0200 Subject: [PATCH 21/35] Properly check valgrind arches Signed-off-by: David Abdurachmanov --- mpich.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpich.spec b/mpich.spec index cde3af5..077fc35 100644 --- a/mpich.spec +++ b/mpich.spec @@ -47,7 +47,7 @@ Provides: bundled(yaksa) = 0.2 %endif # For ./maint/extractcvars BuildRequires: perl(lib) -%ifnarch s390 %{mips} +%ifarch %{valgrind_arches} BuildRequires: valgrind-devel %endif # For %%{python3_sitearch} From 94935be6fc9d18ba7d3e69d8ac4ea94ed6297d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 19 Apr 2024 08:37:46 +0200 Subject: [PATCH 22/35] Version 4.2.1 ... (rhbz#2249294) --- .gitignore | 1 + mpich.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2c227e7..6ed873d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /mpich-4.1.tar.gz /mpich-4.1.1.tar.gz /mpich-4.1.2.tar.gz +/mpich-4.2.1.tar.gz diff --git a/mpich.spec b/mpich.spec index 077fc35..d1f8e49 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,6 +1,6 @@ Summary: A high-performance implementation of MPI Name: mpich -Version: 4.1.2 +Version: 4.2.1 Release: %autorelease License: mpich2 URL: https://www.mpich.org/ diff --git a/sources b/sources index 9eceb11..a370bd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpich-4.1.2.tar.gz) = d1056374ef9ecb6d7816637b6709497e5bc63c3b0af8dfef461aa71a59f9f805b07d80a735eb1511748e78a9260ed967b0597e64a935850fcba1dfef7bf43775 +SHA512 (mpich-4.2.1.tar.gz) = 822e1c22a3ca927c6a2fb1c74ff68140a91ed19fd533c26c1eb7e6c2737bca4735e41dd77add45ba583fadc389dec029af5b174729aaef7447a21b89d78513c6 From 5f6ad30eda45e5b8a5613609908488e87945bf50 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:33:00 +0200 Subject: [PATCH 23/35] Rebuilt for Python 3.13 From cdde714948898f4029125a836ecec79373142797 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:46:11 +0000 Subject: [PATCH 24/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 78a6b78ec3c858dee8d7cd5d83388ebd1260e2f6 Mon Sep 17 00:00:00 2001 From: David Bold Date: Tue, 23 Apr 2024 14:09:59 +0200 Subject: [PATCH 25/35] Remove parkill --- mpich.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpich.spec b/mpich.spec index d1f8e49..8f1b3ba 100644 --- a/mpich.spec +++ b/mpich.spec @@ -217,6 +217,9 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/include find %{buildroot} -type f -name "*.la" -delete +rm %{buildroot}%{_libdir}/%{name}/bin/parkill + + %check make check VERBOSE=1 \ %ifarch ppc64le @@ -244,7 +247,6 @@ make check VERBOSE=1 \ %{_libdir}/%{name}/bin/mpiexec* %{_libdir}/%{name}/bin/mpirun %{_libdir}/%{name}/bin/mpivars -%{_libdir}/%{name}/bin/parkill %dir %{_mandir}/%{name}-%{_arch} %doc %{_mandir}/%{name}-%{_arch}/man1/ %{_datadir}/modulefiles/mpi/ From 48d3a0fdfdb6bc2959718eee2658658dbeac21c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 9 Sep 2024 13:40:05 +0200 Subject: [PATCH 26/35] Version 4.2.2 ... (rhbz#2295613) - Just a bunch of localized bugfixes --- .gitignore | 1 + mpich.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6ed873d..c1daaca 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /mpich-4.1.1.tar.gz /mpich-4.1.2.tar.gz /mpich-4.2.1.tar.gz +/mpich-4.2.2.tar.gz diff --git a/mpich.spec b/mpich.spec index 8f1b3ba..0bfc6ed 100644 --- a/mpich.spec +++ b/mpich.spec @@ -1,6 +1,6 @@ Summary: A high-performance implementation of MPI Name: mpich -Version: 4.2.1 +Version: 4.2.2 Release: %autorelease License: mpich2 URL: https://www.mpich.org/ diff --git a/sources b/sources index a370bd4..09a5e12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpich-4.2.1.tar.gz) = 822e1c22a3ca927c6a2fb1c74ff68140a91ed19fd533c26c1eb7e6c2737bca4735e41dd77add45ba583fadc389dec029af5b174729aaef7447a21b89d78513c6 +SHA512 (mpich-4.2.2.tar.gz) = 706b1f008a4da3bc44b9c8191e20031983eed7d82aadeac8cf4b2c7ffbe5c5ec88c047f7a826e3a0a7e076799e03cceec908853eec89f651de50301af619e757 From 0ba6fefefcb3082f809867db4a3c64a408b50a68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:14:03 +0000 Subject: [PATCH 27/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8bf5ebcd02f152219951811882c1683c5d315301 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 27 Sep 2024 10:28:46 +0300 Subject: [PATCH 28/35] Enable ucx for riscv64 Signed-off-by: David Abdurachmanov --- mpich.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpich.spec b/mpich.spec index 0bfc6ed..173a671 100644 --- a/mpich.spec +++ b/mpich.spec @@ -37,7 +37,7 @@ BuildRequires: libfabric-devel BuildRequires: libnl3-devel BuildRequires: libuuid-devel BuildRequires: numactl-devel -%ifarch aarch64 ppc64le x86_64 +%ifarch aarch64 ppc64le x86_64 riscv64 BuildRequires: ucx-devel %endif %if ! 0%{?rhel} @@ -151,7 +151,7 @@ CONFIGURE_OPTS=( --htmldir=%{_datadir}/%{name}/doc --with-hwloc --with-libfabric -%ifarch aarch64 ppc64le x86_64 +%ifarch aarch64 ppc64le x86_64 riscv64 --with-ucx %endif %if ! 0%{?rhel} From c192fcb977b273f19d089d91a2ac324cc128a68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Feb 2025 17:08:03 +0100 Subject: [PATCH 29/35] Actually add CMAKE_PREFIX_PATH to the module file ... (rhbz#2347503) The patch was edited manually in a way that caused the newly added addition to be ignored. --- 0004-Make-mpich.module-useful.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0004-Make-mpich.module-useful.patch b/0004-Make-mpich.module-useful.patch index ac2a39d..f18ef39 100644 --- a/0004-Make-mpich.module-useful.patch +++ b/0004-Make-mpich.module-useful.patch @@ -11,7 +11,7 @@ diff --git a/src/packaging/envmods/mpich.module.in b/src/packaging/envmods/mpich index 3d6b4fa623..b8283274ee 100644 --- a/src/packaging/envmods/mpich.module.in +++ b/src/packaging/envmods/mpich.module.in -@@ -3,12 +3,23 @@ +@@ -3,12 +3,24 @@ # MPICH module for use with 'environment-modules' package: # From ccead6c4e742e8654ca76cc74b9f735659355c8d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 19:58:01 +0200 Subject: [PATCH 30/35] Rebuilt for Python 3.14 From a3880a2e0698c1ae700217721e1789449604c023 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:24:30 +0000 Subject: [PATCH 31/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 4660251a25f8432e55696590396423dc4cd55eb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 21:41:00 +0000 Subject: [PATCH 32/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 265e2de242ae232d2a47452b72116703d2e0ac88 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 17:37:34 +0200 Subject: [PATCH 33/35] Rebuilt for Python 3.15 From be25d8d4e78af32b2b0b57afdd02fb3e3a1fcc51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 09:02:59 +0000 Subject: [PATCH 34/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 7deb332f1894b90ba3447c1a794d515cb4f1a553 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:52:17 +0200 Subject: [PATCH 35/35] Rebuilt for Python 3.15.0b4 ABI change