RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/mpich#b4333cebe467031f7d20f70a53c442cbbca876e9
This commit is contained in:
Petr Šabata
parent
00373215b7
commit
2135a6386f
8
.gitignore
vendored
8
.gitignore
vendored
@ -0,0 +1,8 @@
|
|||||||
|
/mpich-3.0.4.tar.gz
|
||||||
|
/mpich-3.1.tar.gz
|
||||||
|
/mpich-3.1.4.tar.gz
|
||||||
|
/mpich-3.2.tar.gz
|
||||||
|
/mpich-3.2.1.tar.gz
|
||||||
|
/mpich-3.1.1.tar.gz
|
||||||
|
/mpich-3.3.1.tar.gz
|
||||||
|
/mpich-3.3.2.tar.gz
|
||||||
74
0001-Drop-real128.patch
Normal file
74
0001-Drop-real128.patch
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
From 8f0c71281b5dccd70a3f1d4204e3cc6bc7201ceb Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
|
||||||
|
<zbyszek@arm03-packager01.cloud.fedoraproject.org>
|
||||||
|
Date: Wed, 28 Aug 2019 10:57:55 +0000
|
||||||
|
Subject: [PATCH] Drop real128
|
||||||
|
|
||||||
|
https://github.com/pmodels/mpich/issues/4005
|
||||||
|
---
|
||||||
|
.../fortran/use_mpi_f08/mpi_f08_types.f90 | 24 -------------------
|
||||||
|
1 file changed, 24 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90 b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
|
||||||
|
index f8b0fa811..46bdf6972 100644
|
||||||
|
--- a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
|
||||||
|
+++ b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
|
||||||
|
@@ -248,10 +248,8 @@ interface MPI_Sizeof
|
||||||
|
module procedure MPI_Sizeof_xint64
|
||||||
|
module procedure MPI_Sizeof_xreal32
|
||||||
|
module procedure MPI_Sizeof_xreal64
|
||||||
|
- module procedure MPI_Sizeof_xreal128
|
||||||
|
module procedure MPI_Sizeof_xcomplex32
|
||||||
|
module procedure MPI_Sizeof_xcomplex64
|
||||||
|
- module procedure MPI_Sizeof_xcomplex128
|
||||||
|
end interface
|
||||||
|
|
||||||
|
private :: MPI_Sizeof_character
|
||||||
|
@@ -263,10 +261,8 @@ private :: MPI_Sizeof_xint32
|
||||||
|
private :: MPI_Sizeof_xint64
|
||||||
|
private :: MPI_Sizeof_xreal32
|
||||||
|
private :: MPI_Sizeof_xreal64
|
||||||
|
-private :: MPI_Sizeof_xreal128
|
||||||
|
private :: MPI_Sizeof_xcomplex32
|
||||||
|
private :: MPI_Sizeof_xcomplex64
|
||||||
|
-private :: MPI_Sizeof_xcomplex128
|
||||||
|
|
||||||
|
contains
|
||||||
|
|
||||||
|
@@ -350,16 +346,6 @@ subroutine MPI_Sizeof_xreal64 (x, size, ierror)
|
||||||
|
ierror = 0
|
||||||
|
end subroutine MPI_Sizeof_xreal64
|
||||||
|
|
||||||
|
-subroutine MPI_Sizeof_xreal128 (x, size, ierror)
|
||||||
|
- use,intrinsic :: iso_fortran_env, only: real128
|
||||||
|
- real(real128),dimension(..) :: x
|
||||||
|
- integer, intent(out) :: size
|
||||||
|
- integer, optional, intent(out) :: ierror
|
||||||
|
-
|
||||||
|
- size = storage_size(x)/8
|
||||||
|
- ierror = 0
|
||||||
|
-end subroutine MPI_Sizeof_xreal128
|
||||||
|
-
|
||||||
|
subroutine MPI_Sizeof_xcomplex32 (x, size, ierror)
|
||||||
|
use,intrinsic :: iso_fortran_env, only: real32
|
||||||
|
complex(real32),dimension(..) :: x
|
||||||
|
@@ -380,16 +366,6 @@ subroutine MPI_Sizeof_xcomplex64 (x, size, ierror)
|
||||||
|
ierror = 0
|
||||||
|
end subroutine MPI_Sizeof_xcomplex64
|
||||||
|
|
||||||
|
-subroutine MPI_Sizeof_xcomplex128 (x, size, ierror)
|
||||||
|
- use,intrinsic :: iso_fortran_env, only: real128
|
||||||
|
- complex(real128),dimension(..) :: x
|
||||||
|
- integer, intent(out) :: size
|
||||||
|
- integer, optional, intent(out) :: ierror
|
||||||
|
-
|
||||||
|
- size = storage_size(x)/8
|
||||||
|
- ierror = 0
|
||||||
|
-end subroutine MPI_Sizeof_xcomplex128
|
||||||
|
-
|
||||||
|
subroutine MPI_Status_f2f08(f_status, f08_status, ierror)
|
||||||
|
integer, intent(in) :: f_status(MPI_STATUS_SIZE)
|
||||||
|
type(MPI_Status), intent(out) :: f08_status
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
34
0001-mpl-limit-scope-on-macos-.local-workaround.patch
Normal file
34
0001-mpl-limit-scope-on-macos-.local-workaround.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From fbb8f503df077c726b0c99d467bc984566273b92 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||||
|
Date: Tue, 15 Sep 2020 14:20:17 +0200
|
||||||
|
Subject: [PATCH 1/2] mpl: limit scope on macos .local workaround
|
||||||
|
|
||||||
|
This was added in 62f4178981617384fc116da4c839baf469bef512.
|
||||||
|
Assuming that "localhost" is equivalent to any name ending in .local
|
||||||
|
is unwarranted. RFC6762 reserves the ".local" suffix for MulticastDNS use,
|
||||||
|
but it is also used in other context for "local network" addresses and such.
|
||||||
|
So let's at least limit the scope to not hurt other systems.
|
||||||
|
---
|
||||||
|
src/mpl/src/sock/mpl_sockaddr.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/mpl/src/sock/mpl_sockaddr.c b/src/mpl/src/sock/mpl_sockaddr.c
|
||||||
|
index 51e9f9973f..9334cc4fb2 100644
|
||||||
|
--- a/src/mpl/src/sock/mpl_sockaddr.c
|
||||||
|
+++ b/src/mpl/src/sock/mpl_sockaddr.c
|
||||||
|
@@ -75,6 +75,7 @@ int MPL_get_sockaddr(const char *s_hostname, MPL_sockaddr_t * p_addr)
|
||||||
|
struct addrinfo *ai_list;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
+#ifdef __APPLE__
|
||||||
|
/* Macos adds .local to hostname when network is unavailable or limited.
|
||||||
|
* This will result in long timeout in getaddrinfo below.
|
||||||
|
* Bypass it by resetting the hostname to "localhost"
|
||||||
|
@@ -83,6 +84,7 @@ int MPL_get_sockaddr(const char *s_hostname, MPL_sockaddr_t * p_addr)
|
||||||
|
if (n > 6 && strcmp(s_hostname + n - 6, ".local") == 0) {
|
||||||
|
s_hostname = "localhost";
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* NOTE: there is report that getaddrinfo implementations will call kernel
|
||||||
|
* even when s_hostname is entirely numerical string and it may cause
|
||||||
57
0002-mpl-do-not-require-non-loopback-networking.patch
Normal file
57
0002-mpl-do-not-require-non-loopback-networking.patch
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
From ecb72e6699f4f8525115e0b42f81121a1cf8eefa Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||||||
|
Date: Tue, 15 Sep 2020 14:59:58 +0200
|
||||||
|
Subject: [PATCH 2/2] mpl: do not require non-loopback networking
|
||||||
|
|
||||||
|
getaddrinfo(3) says:
|
||||||
|
If hints.ai_flags includes the AI_ADDRCONFIG flag, then IPv4
|
||||||
|
addresses are returned in the list pointed to by res only if the
|
||||||
|
local system has at least one IPv4 address configured, and IPv6
|
||||||
|
addresses are returned only if the local system has at least one
|
||||||
|
IPv6 address configured. The loopback address is not considered for
|
||||||
|
this case as valid as a configured address.
|
||||||
|
|
||||||
|
This means that MPL_get_sockaddr() will fail to resolve the local host
|
||||||
|
(either as "localhost" or by the actual hostname) on a system that has
|
||||||
|
no non-loopback networking. This break exection of mpirun e.g. in a
|
||||||
|
container for tests and such.
|
||||||
|
|
||||||
|
From https://bugzilla.redhat.com/show_bug.cgi?id=1839007:
|
||||||
|
|
||||||
|
<mock-chroot> sh-5.0# hostname
|
||||||
|
68da8e7c62a2404bb4bf75c9ce643e06
|
||||||
|
<mock-chroot> sh-5.0# module load mpi/mpich-x86_64
|
||||||
|
<mock-chroot> sh-5.0# mpirun ./a.out
|
||||||
|
Fatal error in PMPI_Init: Other MPI error, error stack:
|
||||||
|
MPIR_Init_thread(586)..............:
|
||||||
|
MPID_Init(224).....................: channel initialization failed
|
||||||
|
MPIDI_CH3_Init(105)................:
|
||||||
|
MPID_nem_init(324).................:
|
||||||
|
MPID_nem_tcp_init(175).............:
|
||||||
|
MPID_nem_tcp_get_business_card(404):
|
||||||
|
MPID_nem_tcp_init(375).............: gethostbyname failed, 68da8e7c62a2404bb4bf75c9ce643e06 (errno 0)
|
||||||
|
|
||||||
|
<mock-chroot> sh-5.0# ip a
|
||||||
|
1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1000
|
||||||
|
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
|
||||||
|
inet 127.0.0.1/8 scope host lo
|
||||||
|
valid_lft forever preferred_lft forever
|
||||||
|
inet6 ::1/128 scope host
|
||||||
|
valid_lft forever preferred_lft forever
|
||||||
|
---
|
||||||
|
src/mpl/src/sock/mpl_sockaddr.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/mpl/src/sock/mpl_sockaddr.c b/src/mpl/src/sock/mpl_sockaddr.c
|
||||||
|
index 9334cc4fb2..c0e991c68d 100644
|
||||||
|
--- a/src/mpl/src/sock/mpl_sockaddr.c
|
||||||
|
+++ b/src/mpl/src/sock/mpl_sockaddr.c
|
||||||
|
@@ -98,7 +98,7 @@ int MPL_get_sockaddr(const char *s_hostname, MPL_sockaddr_t * p_addr)
|
||||||
|
ai_hint.ai_family = af_type;
|
||||||
|
ai_hint.ai_socktype = SOCK_STREAM;
|
||||||
|
ai_hint.ai_protocol = IPPROTO_TCP;
|
||||||
|
- ai_hint.ai_flags = AI_ADDRCONFIG | AI_V4MAPPED;
|
||||||
|
+ ai_hint.ai_flags = AI_V4MAPPED;
|
||||||
|
ret = getaddrinfo(s_hostname, NULL, &ai_hint, &ai_list);
|
||||||
|
if (ret) {
|
||||||
|
return ret;
|
||||||
101
4320.patch
Normal file
101
4320.patch
Normal file
@ -0,0 +1,101 @@
|
|||||||
|
From a1524608b05e6c89e2b99f64923f064d888465ce Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hui Zhou <hzhou321@anl.gov>
|
||||||
|
Date: Mon, 18 Nov 2019 14:52:55 -0600
|
||||||
|
Subject: [PATCH 1/2] ch3: fix improper error handling from MPL_get_sockaddr
|
||||||
|
|
||||||
|
MPL layer does not directly return mpi_errno. Use MPIR_ERR_CHKANDJUMP
|
||||||
|
macro to create the appropriate return code. See pmodels/mpich#4318.
|
||||||
|
|
||||||
|
Cherry-picked from [8d923937ec5d].
|
||||||
|
---
|
||||||
|
.../channels/nemesis/netmod/tcp/tcp_init.c | 23 +++++++++++--------
|
||||||
|
1 file changed, 13 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
|
||||||
|
index 4c2383ed8f..bc58211eb6 100644
|
||||||
|
--- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
|
||||||
|
+++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c
|
||||||
|
@@ -307,8 +307,9 @@ static int GetSockInterfaceAddr(int myRank, char *ifname, int maxIfname,
|
||||||
|
if (MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE) {
|
||||||
|
char s[100];
|
||||||
|
int len;
|
||||||
|
- mpi_errno = MPL_get_sockaddr_iface(MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE, p_addr);
|
||||||
|
- MPIR_ERR_CHKANDJUMP1(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**iface_notfound", "**iface_notfound %s", MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE);
|
||||||
|
+ int ret = MPL_get_sockaddr_iface(MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE, p_addr);
|
||||||
|
+ MPIR_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**iface_notfound",
|
||||||
|
+ "**iface_notfound %s", MPIR_CVAR_NEMESIS_TCP_NETWORK_IFACE);
|
||||||
|
|
||||||
|
MPL_sockaddr_to_str(p_addr, s, 100);
|
||||||
|
MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, (MPL_DBG_FDEST,
|
||||||
|
@@ -354,12 +355,13 @@ static int GetSockInterfaceAddr(int myRank, char *ifname, int maxIfname,
|
||||||
|
|
||||||
|
ifname_string = ifname;
|
||||||
|
|
||||||
|
- /* If we didn't find a specific name, then try to get an IP address
|
||||||
|
- directly from the available interfaces, if that is supported on
|
||||||
|
- this platform. Otherwise, we'll drop into the next step that uses
|
||||||
|
- the ifname */
|
||||||
|
- mpi_errno = MPL_get_sockaddr_iface( NULL, p_addr);
|
||||||
|
- if (mpi_errno) MPIR_ERR_POP(mpi_errno);
|
||||||
|
+ /* If we didn't find a specific name, then try to get an IP address
|
||||||
|
+ * directly from the available interfaces, if that is supported on
|
||||||
|
+ * this platform. Otherwise, we'll drop into the next step that uses
|
||||||
|
+ * the ifname */
|
||||||
|
+ int ret = MPL_get_sockaddr_iface(NULL, p_addr);
|
||||||
|
+ MPIR_ERR_CHKANDJUMP1(ret != 0, mpi_errno, MPI_ERR_OTHER, "**iface_notfound",
|
||||||
|
+ "**iface_notfound %s", NULL);
|
||||||
|
ifaddrFound = 1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
@@ -369,8 +371,9 @@ static int GetSockInterfaceAddr(int myRank, char *ifname, int maxIfname,
|
||||||
|
|
||||||
|
/* If we don't have an IP address, try to get it from the name */
|
||||||
|
if (!ifaddrFound) {
|
||||||
|
- mpi_errno = MPL_get_sockaddr(ifname_string, p_addr);
|
||||||
|
- MPIR_ERR_CHKANDJUMP2(mpi_errno, mpi_errno, MPI_ERR_OTHER, "**gethostbyname", "**gethostbyname %s %d", ifname_string, h_errno);
|
||||||
|
+ int ret = MPL_get_sockaddr(ifname_string, p_addr);
|
||||||
|
+ MPIR_ERR_CHKANDJUMP2(ret != 0, mpi_errno, MPI_ERR_OTHER, "**gethostbyname",
|
||||||
|
+ "**gethostbyname %s %d", ifname_string, h_errno);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn_exit:
|
||||||
|
|
||||||
|
From 89157ad35c0885b4758d250d019f0f7cf0f59095 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hui Zhou <hzhou321@anl.gov>
|
||||||
|
Date: Wed, 15 Jan 2020 13:29:56 -0600
|
||||||
|
Subject: [PATCH 2/2] pmi: fix a wrong condition checking return of
|
||||||
|
MPL_get_sockaddr
|
||||||
|
|
||||||
|
Cherry-picked from [3e6af3c2fbaf]. See pmodels/mpich#4318.
|
||||||
|
---
|
||||||
|
src/mpl/include/mpl_sockaddr.h | 3 +++
|
||||||
|
src/pmi/simple/simple_pmi.c | 2 +-
|
||||||
|
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/mpl/include/mpl_sockaddr.h b/src/mpl/include/mpl_sockaddr.h
|
||||||
|
index c0eb749419..a9860c1353 100644
|
||||||
|
--- a/src/mpl/include/mpl_sockaddr.h
|
||||||
|
+++ b/src/mpl/include/mpl_sockaddr.h
|
||||||
|
@@ -21,6 +21,9 @@
|
||||||
|
|
||||||
|
typedef struct sockaddr_storage MPL_sockaddr_t;
|
||||||
|
|
||||||
|
+/* The following functions when return an int, it returns 0 on success,
|
||||||
|
+ * non-zero indicates error. It is consistent with posix socket functions.
|
||||||
|
+ */
|
||||||
|
void MPL_sockaddr_set_aftype(int type);
|
||||||
|
int MPL_get_sockaddr(const char *s_hostname, MPL_sockaddr_t * p_addr);
|
||||||
|
int MPL_get_sockaddr_direct(int type, MPL_sockaddr_t * p_addr);
|
||||||
|
diff --git a/src/pmi/simple/simple_pmi.c b/src/pmi/simple/simple_pmi.c
|
||||||
|
index df37a8689f..7f660bdac9 100644
|
||||||
|
--- a/src/pmi/simple/simple_pmi.c
|
||||||
|
+++ b/src/pmi/simple/simple_pmi.c
|
||||||
|
@@ -881,7 +881,7 @@ static int PMII_Connect_to_pm(char *hostname, int portnum)
|
||||||
|
int q_wait = 1;
|
||||||
|
|
||||||
|
ret = MPL_get_sockaddr(hostname, &addr);
|
||||||
|
- if (!ret) {
|
||||||
|
+ if (ret) {
|
||||||
|
PMIU_printf(1, "Unable to get host entry for %s\n", hostname);
|
||||||
|
return PMI_FAIL;
|
||||||
|
}
|
||||||
160
fix_wrapper_flags.patch
Normal file
160
fix_wrapper_flags.patch
Normal file
@ -0,0 +1,160 @@
|
|||||||
|
diff -Naur mpich-3.3.2.orig/src/env/mpicc.bash.in mpich-3.3.2/src/env/mpicc.bash.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpicc.bash.in 2020-08-06 00:42:51.089874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpicc.bash.in 2020-08-06 00:49:34.849138000 +0000
|
||||||
|
@@ -214,13 +214,13 @@
|
||||||
|
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_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 -Naur mpich-3.3.2.orig/src/env/mpicc.sh.in mpich-3.3.2/src/env/mpicc.sh.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpicc.sh.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpicc.sh.in 2020-08-06 00:49:34.849138000 +0000
|
||||||
|
@@ -223,13 +223,13 @@
|
||||||
|
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_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 -Naur mpich-3.3.2.orig/src/env/mpicxx.bash.in mpich-3.3.2/src/env/mpicxx.bash.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpicxx.bash.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpicxx.bash.in 2020-08-06 00:49:34.849138000 +0000
|
||||||
|
@@ -220,13 +220,13 @@
|
||||||
|
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_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 -Naur mpich-3.3.2.orig/src/env/mpicxx.sh.in mpich-3.3.2/src/env/mpicxx.sh.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpicxx.sh.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpicxx.sh.in 2020-08-06 00:49:34.850138000 +0000
|
||||||
|
@@ -229,13 +229,13 @@
|
||||||
|
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_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 -Naur mpich-3.3.2.orig/src/env/mpif77.bash.in mpich-3.3.2/src/env/mpif77.bash.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpif77.bash.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpif77.bash.in 2020-08-06 00:49:34.852138000 +0000
|
||||||
|
@@ -272,12 +272,12 @@
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
-final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
|
||||||
|
-final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||||
|
+final_fflags="@MPICH_MPIF77_FFLAGS@ "
|
||||||
|
+final_ldflags="@MPICH_MPIF77_LDFLAGS@ "
|
||||||
|
final_libs="@MPICH_MPIF77_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 -Naur mpich-3.3.2.orig/src/env/mpif77.sh.in mpich-3.3.2/src/env/mpif77.sh.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpif77.sh.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpif77.sh.in 2020-08-06 00:49:34.852138000 +0000
|
||||||
|
@@ -294,12 +294,12 @@
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
-final_fflags="@MPICH_MPIF77_FFLAGS@ @WRAPPER_FFLAGS@"
|
||||||
|
-final_ldflags="@MPICH_MPIF77_LDFLAGS@ @WRAPPER_LDFLAGS@"
|
||||||
|
+final_fflags="@MPICH_MPIF77_FFLAGS@ "
|
||||||
|
+final_ldflags="@MPICH_MPIF77_LDFLAGS@ "
|
||||||
|
final_libs="@MPICH_MPIF77_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 -Naur mpich-3.3.2.orig/src/env/mpifort.bash.in mpich-3.3.2/src/env/mpifort.bash.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpifort.bash.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpifort.bash.in 2020-08-06 00:49:34.854138000 +0000
|
||||||
|
@@ -313,12 +313,12 @@
|
||||||
|
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_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 -Naur mpich-3.3.2.orig/src/env/mpifort.sh.in mpich-3.3.2/src/env/mpifort.sh.in
|
||||||
|
--- mpich-3.3.2.orig/src/env/mpifort.sh.in 2020-08-06 00:42:51.090874000 +0000
|
||||||
|
+++ mpich-3.3.2/src/env/mpifort.sh.in 2020-08-06 00:49:34.854138000 +0000
|
||||||
|
@@ -330,12 +330,12 @@
|
||||||
|
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_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
|
||||||
33
mpich-modules.patch
Normal file
33
mpich-modules.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
--- mpich-3.2.1/src/packaging/envmods/mpich.module.in.orig 2017-11-11 03:19:44.000000000 +0100
|
||||||
|
+++ mpich-3.2.1/src/packaging/envmods/mpich.module.in 2018-04-04 14:14:16.553160669 +0200
|
||||||
|
@@ -3,12 +3,23 @@
|
||||||
|
# MPICH module for use with 'environment-modules' package:
|
||||||
|
#
|
||||||
|
|
||||||
|
+# Only allow one mpi module to be loaded at a time
|
||||||
|
+conflict mpi
|
||||||
|
+
|
||||||
|
# Define prefix so PATH and MANPATH can be updated.
|
||||||
|
-setenv prefix @prefix@
|
||||||
|
-setenv exec_prefix @exec_prefix@
|
||||||
|
+setenv MPI_BIN @LIBDIR@/bin
|
||||||
|
+setenv MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@
|
||||||
|
+setenv MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@
|
||||||
|
+setenv MPI_INCLUDE @includedir@
|
||||||
|
+setenv MPI_LIB @libdir@
|
||||||
|
+setenv MPI_MAN @mandir@
|
||||||
|
+setenv MPI_PYTHON_SITEARCH @py2sitearch@/@MPINAME@
|
||||||
|
+setenv MPI_PYTHON2_SITEARCH @py2sitearch@/@MPINAME@
|
||||||
|
+setenv MPI_PYTHON3_SITEARCH @py3sitearch@/@MPINAME@
|
||||||
|
+setenv MPI_COMPILER @MPINAME@-@ARCH@
|
||||||
|
+setenv MPI_SUFFIX _@MPINAME@
|
||||||
|
+setenv MPI_HOME @LIBDIR@
|
||||||
|
prepend-path PATH @bindir@
|
||||||
|
-prepend-path MANPATH @mandir@
|
||||||
|
-
|
||||||
|
-# Undefine prefix and exec_prefix which are too generic environment variables.
|
||||||
|
-unsetenv prefix
|
||||||
|
-unsetenv exec_prefix
|
||||||
|
+prepend-path LD_LIBRARY_PATH @libdir@
|
||||||
|
+prepend-path MANPATH :@mandir@
|
||||||
|
+prepend-path PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig
|
||||||
7
mpich.macros
Normal file
7
mpich.macros
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
%_mpich_load \
|
||||||
|
. /etc/profile.d/modules.sh; \
|
||||||
|
module load mpi/mpich-%{_arch}; \
|
||||||
|
export CFLAGS="$CFLAGS %{optflags}";
|
||||||
|
%_mpich_unload \
|
||||||
|
. /etc/profile.d/modules.sh; \
|
||||||
|
module unload mpi/mpich-%{_arch};
|
||||||
1
mpich.pth.py2
Normal file
1
mpich.pth.py2
Normal file
@ -0,0 +1 @@
|
|||||||
|
import sys, os; s = os.getenv('MPI_PYTHON2_SITEARCH'); s and (s in sys.path or sys.path.append(s))
|
||||||
1
mpich.pth.py3
Normal file
1
mpich.pth.py3
Normal file
@ -0,0 +1 @@
|
|||||||
|
import sys, os; s = os.getenv('MPI_PYTHON3_SITEARCH'); s and (s in sys.path or sys.path.append(s))
|
||||||
488
mpich.spec
Normal file
488
mpich.spec
Normal file
@ -0,0 +1,488 @@
|
|||||||
|
Summary: A high-performance implementation of MPI
|
||||||
|
Name: mpich
|
||||||
|
Version: 3.3.2
|
||||||
|
Release: 8%{?dist}
|
||||||
|
License: MIT
|
||||||
|
URL: https://www.mpich.org/
|
||||||
|
|
||||||
|
Source0: https://www.mpich.org/static/downloads/%{version}/%{name}-%{version}.tar.gz
|
||||||
|
Source1: mpich.macros
|
||||||
|
Source2: mpich.pth.py2
|
||||||
|
Source3: mpich.pth.py3
|
||||||
|
Patch0: mpich-modules.patch
|
||||||
|
Patch1: 0001-Drop-real128.patch
|
||||||
|
# fix for #1793563 and #1799473
|
||||||
|
Patch2: https://github.com/pmodels/mpich/pull/4320.patch
|
||||||
|
# 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/
|
||||||
|
Patch3: fix_wrapper_flags.patch
|
||||||
|
|
||||||
|
Patch4: 0001-mpl-limit-scope-on-macos-.local-workaround.patch
|
||||||
|
Patch5: 0002-mpl-do-not-require-non-loopback-networking.patch
|
||||||
|
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: gcc-gfortran
|
||||||
|
BuildRequires: hwloc-devel >= 2.0
|
||||||
|
%ifnarch s390 %{mips}
|
||||||
|
BuildRequires: valgrind-devel
|
||||||
|
%endif
|
||||||
|
# For %%{python3_sitearch}
|
||||||
|
BuildRequires: python3-devel
|
||||||
|
BuildRequires: rpm-mpi-hooks
|
||||||
|
BuildRequires: automake
|
||||||
|
Provides: mpi
|
||||||
|
Provides: mpich2 = %{version}
|
||||||
|
Obsoletes: mpich2 < 3.0
|
||||||
|
Requires: environment(modules)
|
||||||
|
|
||||||
|
# Make sure this package is rebuilt with correct Python version when updating
|
||||||
|
# Otherwise mpi.req from rpm-mpi-hooks doesn't work
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1705296
|
||||||
|
Requires: (python(abi) = %{python3_version} if python3)
|
||||||
|
|
||||||
|
%description
|
||||||
|
MPICH is a high-performance and widely portable implementation of the Message
|
||||||
|
Passing Interface (MPI) standard (MPI-1, MPI-2 and MPI-3). The goals of MPICH
|
||||||
|
are: (1) to provide an MPI implementation that efficiently supports different
|
||||||
|
computation and communication platforms including commodity clusters (desktop
|
||||||
|
systems, shared-memory systems, multicore architectures), high-speed networks
|
||||||
|
(10 Gigabit Ethernet, InfiniBand, Myrinet, Quadrics) and proprietary high-end
|
||||||
|
computing systems (Blue Gene, Cray) and (2) to enable cutting-edge research in
|
||||||
|
MPI through an easy-to-extend modular framework for other derived
|
||||||
|
implementations.
|
||||||
|
|
||||||
|
The mpich binaries in this RPM packages were configured to use the default
|
||||||
|
process manager (Hydra) using the default device (ch3). The ch3 device
|
||||||
|
was configured with support for the nemesis channel that allows for
|
||||||
|
shared-memory and TCP/IP sockets based communication.
|
||||||
|
|
||||||
|
This build also include support for using the 'module environment' to select
|
||||||
|
which MPI implementation to use when multiple implementations are installed.
|
||||||
|
If you want MPICH support to be automatically loaded, you need to install the
|
||||||
|
mpich-autoload package.
|
||||||
|
|
||||||
|
%package autoload
|
||||||
|
Summary: Load mpich automatically into profile
|
||||||
|
Requires: mpich = %{version}-%{release}
|
||||||
|
Provides: mpich2-autoload = 3.0.1
|
||||||
|
Obsoletes: mpich2-autoload < 3.0
|
||||||
|
|
||||||
|
%description autoload
|
||||||
|
This package contains profile files that make mpich automatically loaded.
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Development files for mpich
|
||||||
|
Provides: %{name}-devel-static = %{version}-%{release}
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: pkgconfig
|
||||||
|
Requires: gcc-gfortran
|
||||||
|
Requires: rpm-mpi-hooks
|
||||||
|
Requires: redhat-rpm-config
|
||||||
|
Provides: mpich2-devel = 3.0.1
|
||||||
|
Obsoletes: mpich2-devel < 3.0
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
Contains development headers and libraries for mpich
|
||||||
|
|
||||||
|
%package doc
|
||||||
|
Summary: Documentations and examples for mpich
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires: %{name}-devel = %{version}-%{release}
|
||||||
|
Provides: mpich2-doc = 3.0.1
|
||||||
|
Obsoletes: mpich2-doc < 3.0
|
||||||
|
|
||||||
|
%description doc
|
||||||
|
Contains documentations, examples and man-pages for mpich
|
||||||
|
|
||||||
|
%package -n python3-mpich
|
||||||
|
Summary: mpich support for Python 3
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: python(abi) = %{python3_version}
|
||||||
|
|
||||||
|
%description -n python3-mpich
|
||||||
|
mpich support for Python 3.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
%ifarch %{arm}
|
||||||
|
%patch1 -p1
|
||||||
|
%endif
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
CONFIGURE_OPTS=(
|
||||||
|
--enable-sharedlibs=gcc
|
||||||
|
--enable-shared
|
||||||
|
--enable-static=no
|
||||||
|
--enable-lib-depend
|
||||||
|
--disable-rpath
|
||||||
|
--disable-silent-rules
|
||||||
|
--enable-fc
|
||||||
|
--with-device=ch3:nemesis
|
||||||
|
--with-pm=hydra:gforker
|
||||||
|
--includedir=%{_includedir}/%{name}-%{_arch}
|
||||||
|
--bindir=%{_libdir}/%{name}/bin
|
||||||
|
--libdir=%{_libdir}/%{name}/lib
|
||||||
|
--datadir=%{_datadir}/%{name}
|
||||||
|
--mandir=%{_mandir}/%{name}-%{_arch}
|
||||||
|
--docdir=%{_datadir}/%{name}/doc
|
||||||
|
--htmldir=%{_datadir}/%{name}/doc
|
||||||
|
--with-hwloc-prefix=system
|
||||||
|
)
|
||||||
|
|
||||||
|
# Set -fallow-argument-mismatch for #1795817
|
||||||
|
%configure "${CONFIGURE_OPTS[@]}" FFLAGS="$FFLAGS -fallow-argument-mismatch"
|
||||||
|
|
||||||
|
# Remove rpath
|
||||||
|
sed -r -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||||
|
sed -r -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
|
|
||||||
|
#Try and work around 'unused-direct-shlib-dependency' rpmlint warnning
|
||||||
|
sed -i -e 's| -shared | -Wl,--as-needed\0|g' libtool
|
||||||
|
|
||||||
|
# work-around libtool error: cannot determine absolute directory name of 'system/lib'
|
||||||
|
mkdir -p system/lib
|
||||||
|
|
||||||
|
%make_build VERBOSE=1
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{_fmoddir}/%{name}
|
||||||
|
mv %{buildroot}%{_includedir}/%{name}-*/*.mod %{buildroot}%{_fmoddir}/%{name}/
|
||||||
|
sed -r -i 's|^modincdir=.*|modincdir=%{_fmoddir}/%{name}|' %{buildroot}%{_libdir}/%{name}/bin/mpifort
|
||||||
|
|
||||||
|
# Install the module file
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/modulefiles/mpi
|
||||||
|
sed -r 's|%{_bindir}|%{_libdir}/%{name}/bin|;
|
||||||
|
s|@LIBDIR@|%{_libdir}/%{name}|;
|
||||||
|
s|@MPINAME@|%{name}|;
|
||||||
|
s|@py2sitearch@|%{python2_sitearch}|;
|
||||||
|
s|@py3sitearch@|%{python3_sitearch}|;
|
||||||
|
s|@ARCH@|%{_arch}|;
|
||||||
|
s|@fortranmoddir@|%{_fmoddir}|;
|
||||||
|
' \
|
||||||
|
<src/packaging/envmods/mpich.module \
|
||||||
|
>%{buildroot}%{_datadir}/modulefiles/mpi/%{name}-%{_arch}
|
||||||
|
|
||||||
|
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
|
||||||
|
cat >%{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh <<EOF
|
||||||
|
# Load mpich environment module
|
||||||
|
module load mpi/%{name}-%{_arch}
|
||||||
|
EOF
|
||||||
|
cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
|
||||||
|
|
||||||
|
# Install the RPM macros
|
||||||
|
install -pDm0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
|
||||||
|
|
||||||
|
# Install the .pth files
|
||||||
|
mkdir -p %{buildroot}%{python2_sitearch}/%{name}
|
||||||
|
install -pDm0644 %{SOURCE2} %{buildroot}%{python2_sitearch}/%{name}.pth
|
||||||
|
mkdir -p %{buildroot}%{python3_sitearch}/%{name}
|
||||||
|
install -pDm0644 %{SOURCE3} %{buildroot}%{python3_sitearch}/%{name}.pth
|
||||||
|
|
||||||
|
find %{buildroot} -type f -name "*.la" -delete
|
||||||
|
|
||||||
|
%check
|
||||||
|
make check VERBOSE=1 \
|
||||||
|
%ifarch ppc64le
|
||||||
|
|| :
|
||||||
|
%endif
|
||||||
|
# The test results are ignored on ppc64le. The tests started failing
|
||||||
|
# in the bundled openpa checksuite. Upstream has already removed it,
|
||||||
|
# so the issue should resolve itself for the next release and I don't
|
||||||
|
# think it's worth the time to solve it here.
|
||||||
|
|
||||||
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYRIGHT
|
||||||
|
%doc CHANGES README README.envvar RELEASE_NOTES
|
||||||
|
%dir %{_libdir}/%{name}
|
||||||
|
%dir %{_libdir}/%{name}/lib
|
||||||
|
%dir %{_libdir}/%{name}/bin
|
||||||
|
%{_libdir}/%{name}/lib/*.so.*
|
||||||
|
%{_libdir}/%{name}/bin/hydra*
|
||||||
|
%{_libdir}/%{name}/bin/mpichversion
|
||||||
|
%{_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/
|
||||||
|
|
||||||
|
%files autoload
|
||||||
|
%{_sysconfdir}/profile.d/mpich-%{_arch}.*
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%{_includedir}/%{name}-%{_arch}/
|
||||||
|
%{_libdir}/%{name}/lib/pkgconfig/
|
||||||
|
%{_libdir}/%{name}/lib/*.so
|
||||||
|
%{_libdir}/%{name}/bin/mpicc
|
||||||
|
%{_libdir}/%{name}/bin/mpic++
|
||||||
|
%{_libdir}/%{name}/bin/mpicxx
|
||||||
|
%{_libdir}/%{name}/bin/mpif77
|
||||||
|
%{_libdir}/%{name}/bin/mpif90
|
||||||
|
%{_libdir}/%{name}/bin/mpifort
|
||||||
|
%{_fmoddir}/%{name}/
|
||||||
|
%{_rpmconfigdir}/macros.d/macros.%{name}
|
||||||
|
%{_mandir}/%{name}-%{_arch}/man3/
|
||||||
|
|
||||||
|
%files doc
|
||||||
|
%dir %{_datadir}/%{name}
|
||||||
|
%{_datadir}/%{name}/doc/
|
||||||
|
|
||||||
|
%files -n python3-mpich
|
||||||
|
%dir %{python3_sitearch}/%{name}
|
||||||
|
%{python3_sitearch}/%{name}.pth
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Tue Sep 15 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3.2-8
|
||||||
|
- Do not require non-loopback addresses in mpirun (#1839007)
|
||||||
|
|
||||||
|
* Thu Aug 06 2020 Christoph Junghans <junghans@votca.org> - 3.3.2-7
|
||||||
|
- Drop build flag from mpi wrappers
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 3.3.2-5
|
||||||
|
- Rebuilt for Python 3.9
|
||||||
|
|
||||||
|
* Fri Feb 14 2020 Christoph Junghans <junghans@votca.org> - 3.3.2-4
|
||||||
|
- Add 4320.patch to fix #1793563 and #1799473
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3.2-3
|
||||||
|
- Add requirement for redhat-rpm-config (#1795674)
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Nov 17 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3.2-1
|
||||||
|
- Subpackage python2-mpich has been removed (#1773126)
|
||||||
|
|
||||||
|
* Sun Nov 17 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3.2-1
|
||||||
|
- Update to latest version (#1772152). This is a bugfix release:
|
||||||
|
https://github.com/pmodels/mpich/blob/v3.3.2/CHANGES.
|
||||||
|
|
||||||
|
* Wed Aug 28 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.3.1-1
|
||||||
|
- Really upgrade to 3.3.1 (#1745252)
|
||||||
|
|
||||||
|
* Sat Aug 24 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-1
|
||||||
|
- "Upgrade" back to 3.2.1 (#1745252)
|
||||||
|
(I made a typo, and instead of *upgrading* to 3.3.1, I made a downgrade
|
||||||
|
to 3.1.1. Too bad that we don't have *any* automatic check that would
|
||||||
|
warn about this in Fedora. Version 3.3.1 requires a newer hwloc, but
|
||||||
|
some of the dependencies are not ready to switch. So let's "upgrade"
|
||||||
|
back to 3.2.1, and plan to 3.3.1 next week.)
|
||||||
|
|
||||||
|
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.1.1-2
|
||||||
|
- Rebuilt for Python 3.8
|
||||||
|
|
||||||
|
* Tue Jul 30 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.1-1
|
||||||
|
- Update to latest version (#1718376)
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 8 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-12
|
||||||
|
- Require main package and appropriate python version from python subpackages
|
||||||
|
|
||||||
|
* Tue May 7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-11
|
||||||
|
- Add a guard for python3 version (#1705296)
|
||||||
|
- Module files are moved to /usr/share/modulefiles/mpi/
|
||||||
|
|
||||||
|
* Tue May 7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-10
|
||||||
|
- Drop all custom compilation and link flags (#1573088)
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-7
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
|
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-6
|
||||||
|
- Rebuilt for Python 3.7
|
||||||
|
|
||||||
|
* Wed Apr 4 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-5
|
||||||
|
- Update MANPATH so that normal man pages can still be found (#1533717)
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Feb 01 2018 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.2.1-3
|
||||||
|
- Rebuilt for GCC-8.0.1.
|
||||||
|
|
||||||
|
* Sun Nov 12 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-2
|
||||||
|
- Update $modincdir in mpifort after moving .mod files (#1301533)
|
||||||
|
- Move compiler wrappers to mpich-devel (#1353621)
|
||||||
|
- Remove bogus rpath (#1361586)
|
||||||
|
|
||||||
|
* Sun Nov 12 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-1
|
||||||
|
- Update to latest bugfix release (#1512188)
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 3.2-7
|
||||||
|
- Rebuild for Python 3.6
|
||||||
|
|
||||||
|
* Wed Nov 2 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2-7
|
||||||
|
- Split python support into sub-packages
|
||||||
|
|
||||||
|
* Wed Mar 30 2016 Michal Toman <mtoman@fedoraproject.org> - 3.2-6
|
||||||
|
- Fix build on MIPS
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 22 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2-4
|
||||||
|
- Add patch to allow -host localhost to work on builders
|
||||||
|
|
||||||
|
* Wed Jan 20 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2-3
|
||||||
|
- Use nemesis channel on all platforms
|
||||||
|
|
||||||
|
* Wed Dec 9 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2-2
|
||||||
|
- Soften version check (#1289779)
|
||||||
|
|
||||||
|
* Tue Dec 1 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2-1
|
||||||
|
- Update to latest version
|
||||||
|
|
||||||
|
* Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-9
|
||||||
|
- Update requires and fix MPI_FORTRAN_MOD_DIR var
|
||||||
|
|
||||||
|
* Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-8
|
||||||
|
- Move fortran .mod files to %%{_fmoddir}/mpich (#1154991)
|
||||||
|
- Move man pages to arch-specific dir (#1264359)
|
||||||
|
|
||||||
|
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
|
||||||
|
|
||||||
|
* Thu Aug 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-6
|
||||||
|
- Use .pth files to set the python path (https://fedorahosted.org/fpc/ticket/563)
|
||||||
|
- Cleanups to the spec file
|
||||||
|
|
||||||
|
* Sun Jul 26 2015 Sandro Mani <manisandro@gmail.com> - 3.1.4-5
|
||||||
|
- Require, BuildRequire: rpm-mpi-hooks
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat May 9 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-3
|
||||||
|
- Change MPI_SYCONFIG to /etc/mpich-x86_64 (#1196728)
|
||||||
|
|
||||||
|
* Fri Mar 13 2015 Orion Poplawski <orion@cora.nwra.com> - 3.1.4-2
|
||||||
|
- Set PKG_CONFIG_DIR (bug #1113627)
|
||||||
|
- Fix modulefile names and python paths (bug#1201343)
|
||||||
|
|
||||||
|
* Wed Mar 11 2015 Orion Poplawski <orion@cora.nwra.com> - 3.1.4-1
|
||||||
|
- Update to 3.1.4
|
||||||
|
- Own and set PKG_CONFIG_DIR (bug #1113627)
|
||||||
|
- Do not ship old modulefile location (bug #921534)
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 21 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.1-2
|
||||||
|
- Install rpm macros to %%{_rpmconfigdir}/macros.d as non-%%config.
|
||||||
|
|
||||||
|
* Fri Feb 21 2014 Deji Akingunola <dakingun@gmail.com> - 3.1-1
|
||||||
|
- Update to 3.1
|
||||||
|
|
||||||
|
* Mon Jan 6 2014 Peter Robinson <pbrobinson@fedoraproject.org> 3.0.4-7
|
||||||
|
- Set the aarch64 compiler options
|
||||||
|
|
||||||
|
* Fri Dec 13 2013 Peter Robinson <pbrobinson@fedoraproject.org> 3.0.4-6
|
||||||
|
- Now have valgrind on ARMv7
|
||||||
|
- No valgrind on aarch64
|
||||||
|
|
||||||
|
* Fri Aug 23 2013 Orion Poplawski <orion@cora.nwra.com> - 3.0.4-5
|
||||||
|
- Add %%check
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 20 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-3
|
||||||
|
- Add proper Provides and Obsoletes for the sub-packages
|
||||||
|
|
||||||
|
* Thu Jul 18 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-2
|
||||||
|
- Fix some of the rpmlint warnings from package review (BZ #973493)
|
||||||
|
|
||||||
|
* Wed Jun 12 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.4-1
|
||||||
|
- Update to 3.0.4
|
||||||
|
|
||||||
|
* Thu Feb 21 2013 Deji Akingunola <dakingun@gmail.com> - 3.0.2-1
|
||||||
|
- Update to 3.0.2
|
||||||
|
- Rename to mpich.
|
||||||
|
- Drop check for old alternatives' installation
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Nov 1 2012 Orion Poplawski <orion@cora.nwra.com> - 1.5-1
|
||||||
|
- Update to 1.5
|
||||||
|
- Drop destdir-fix and mpicxx-und patches
|
||||||
|
- Update rpm macros to use the new module location
|
||||||
|
|
||||||
|
* Wed Oct 31 2012 Orion Poplawski <orion@cora.nwra.com> - 1.4.1p1-9
|
||||||
|
- Install module file in mpi subdirectory and conflict with other mpi modules
|
||||||
|
- Leave existing module file location for backwards compatibility for a while
|
||||||
|
|
||||||
|
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1p1-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 15 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.1p1-7
|
||||||
|
- Rebuild for new hwloc
|
||||||
|
|
||||||
|
* Wed Feb 15 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.4.1p1-6
|
||||||
|
- Update ARM build configuration
|
||||||
|
|
||||||
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1p1-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 2 2012 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.4.1p1-4
|
||||||
|
- Bump spec.
|
||||||
|
|
||||||
|
* Wed Nov 16 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.4.1p1-3
|
||||||
|
- Comply to MPI guidelines by separating autoloading into separate package
|
||||||
|
(BZ #647147).
|
||||||
|
|
||||||
|
* Tue Oct 18 2011 Deji Akingunola <dakingun@gmail.com> - 1.4.1p1-2
|
||||||
|
- Rebuild for hwloc soname bump.
|
||||||
|
|
||||||
|
* Sun Sep 11 2011 Deji Akingunola <dakingun@gmail.com> - 1.4.1p1-1
|
||||||
|
- Update to 1.4.1p1 patch update
|
||||||
|
- Add enable-lib-depend to configure flags
|
||||||
|
|
||||||
|
* Sat Aug 27 2011 Deji Akingunola <dakingun@gmail.com> - 1.4.1-1
|
||||||
|
- Update to 1.4.1 final
|
||||||
|
- Drop the mpd subpackage, the PM is no longer supported upstream
|
||||||
|
- Fix undefined symbols in libmpichcxx (again) (#732926)
|
||||||
|
|
||||||
|
* Wed Aug 03 2011 Jussi Lehtola <jussilehtola@fedoraproject.org> - 1.4-2
|
||||||
|
- Respect environment module guidelines wrt placement of module file.
|
||||||
|
|
||||||
|
* Fri Jun 17 2011 Deji Akingunola <dakingun@gmail.com> - 1.4-1
|
||||||
|
- Update to 1.4 final
|
||||||
Loading…
Reference in New Issue
Block a user