Accepting request 1198939 from science:HPC

OBS-URL: https://build.opensuse.org/request/show/1198939
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mvapich2?expand=0&rev=39

0001-Drop-real128.patch

@@ -1,18 +1,17 @@
-From 8f0c71281b5dccd70a3f1d4204e3cc6bc7201ceb Mon Sep 17 00:00:00 2001
+commit d08634eff711fd6c68bc197aec538a9f15a067eb
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?=
+Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- <zbyszek@arm03-packager01.cloud.fedoraproject.org>
+Date:   Fri Jun 5 10:07:37 2020 +0200
-Date: Wed, 28 Aug 2019 10:57:55 +0000
-Subject: [PATCH] Drop real128
 
-https://github.com/pmodels/mpich/issues/4005
+    0001 Drop real128
----
- .../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
+    See https://github.com/pmodels/mpich/issues/4005
-index f8b0fa811..46bdf6972 100644
+    
---- a/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
+    Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
-+++ b/src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
+
+diff --git src/binding/fortran/use_mpi_f08/mpi_f08_types.f90 src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
+index f8b0fa811e01..46bdf6972dde 100644
+--- src/binding/fortran/use_mpi_f08/mpi_f08_types.f90
++++ 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
@@ -69,6 +68,3 @@ index f8b0fa811..46bdf6972 100644
  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
-

mrail-fix-incompatible-pointer-issues.patch

@@ -0,0 +1,56 @@
+commit 0b2339b6c8d2221a0db1e2f00b87025c7aac4fb7
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Thu Sep 5 08:51:06 2024 +0200
+
+    mrail: fix incompatible pointer issues
+    
+    GCC 14 is complaining about incompatible pointer types.
+    Fix the function definition so quiet them.
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git src/mpid/ch3/channels/mrail/src/gen2/ofed_abstraction.h src/mpid/ch3/channels/mrail/src/gen2/ofed_abstraction.h
+index 07190c5177e6..36462b6bbd64 100644
+--- src/mpid/ch3/channels/mrail/src/gen2/ofed_abstraction.h
++++ src/mpid/ch3/channels/mrail/src/gen2/ofed_abstraction.h
+@@ -191,10 +191,11 @@ typedef struct _rdma_ops_t {
+     int (*get_cm_event)(struct rdma_event_channel *channel,
+               struct rdma_cm_event **event);
+     int (*ack_cm_event)(struct rdma_cm_event *event);
+-    int (*getaddrinfo) (char *node, char *service, struct rdma_addrinfo *hints,
+-                        struct rdma_addrinfo **res);
+-    int (*freeaddrinfo)(struct rdma_addrinfo *res);
+-    char* (*event_str)(enum rdma_cm_event_type event);
++    int (*getaddrinfo) (const char *node, const char *service,
++			const struct rdma_addrinfo *hints,
++			struct rdma_addrinfo **res);
++    void (*freeaddrinfo)(struct rdma_addrinfo *res);
++    const char* (*event_str)(enum rdma_cm_event_type event);
+     struct ibv_context** (*get_devices) (int *num_devices);
+     void (*free_devices) (struct ibv_context **list);
+ } rdma_ops_t;
+@@ -208,13 +209,13 @@ extern void *rdma_dl_handle;
+ typedef struct _umad_ops_t {
+     int (*init)(void);
+     int (*done)(void);
+-    int (*get_ca)(char *ca_name, umad_ca_t *ca);
++    int (*get_ca)(const char *ca_name, umad_ca_t *ca);
+     int (*release_ca)(umad_ca_t *ca);
+     void* (*get_mad)(void *umad);
+     int (*send)(int portid, int agentid, void *umad, int length,
+                 int timeout_ms, int retries);
+     int (*recv)(int portid, void *umad, int *length, int timeout_ms);
+-    int (*open_port)(char *ca_name, int portnum);
++    int (*open_port)(const char *ca_name, int portnum);
+     int (*close_port)(int portid);
+     int (*u_register)(int portid, int mgmt_class, int mgmt_version,
+                   uint8_t rmpp_version, long method_mask[16 / sizeof(long)]);
+@@ -309,7 +310,7 @@ do {                                                                    \
+ #else
+ #define MV2_DLSYM(_struct_, _handle_, _prefix_, _function_)             \
+ do {                                                                    \
+-    _struct_._function_ = _prefix_##_##_function_;                      \
++    _struct_._function_ = (void*)_prefix_##_##_function_;		\
+ } while (0)
+ #endif
+ 

mvapich2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep  5 07:24:42 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Add patches to fix compilation errors with GCC >= 14:
+  - mrail-fix-incompatible-pointer-issues.patch
+  - util-add-missing-include.patch
+  - psm-add-missing-declaration.patch
+- Refresh 0001-Drop-real128.patch to work with patch -p0
+- Switch to autopatch
+
 -------------------------------------------------------------------
 Tue Jun 25 13:22:53 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
 

mvapich2.spec

@@ -216,6 +216,10 @@ Patch4:         reproducible.patch
 Patch5:         pass-correct-size-to-snprintf.patch
 Patch6:         mvapich2-allow-building-with-external-hwloc.patch
 Patch7:         mvapich2-openpa-add-memory-barriers.patch
+Patch8:         mrail-fix-incompatible-pointer-issues.patch
+Patch9:         util-add-missing-include.patch
+Patch10:        psm-add-missing-declaration.patch
+
 ## Armv7 specific patches
 # PATCH-FIX-UPSTREAM 0001-Drop-real128.patch (https://github.com/pmodels/mpich/issues/4005)
 Patch50:        0001-Drop-real128.patch
@@ -347,18 +351,11 @@ is based on MPICH2 and MVICH. This package contains the static libraries
 
 %{?with_hpc:%hpc_debug}
 %setup -q -n mvapich2-%{version}%{?rc_ver}
-%patch -P 0
+%autopatch -M 49 -p0
-%patch -P 2
-%patch -P 3
-%patch -P 4
-%patch -P 5 -p1
-%patch -P 6
-%patch -P 7
 
 # Only apply these patches on Armv7
 %ifarch armv7hl
-%patch -P 50 -p1
+%autopatch -m 50 -p0
-%patch -P 51
 %endif
 cp /usr/share/automake*/config.* .
 

psm-add-missing-declaration.patch

@@ -0,0 +1,20 @@
+commit 54cb73337039c22aed5b2b4ee7b19aeb8df33b2c
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Thu Sep 5 10:11:46 2024 +0200
+
+    psm: add missing declaration
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git src/mpid/ch3/channels/psm/src/psm_entry.c src/mpid/ch3/channels/psm/src/psm_entry.c
+index 125194750a0f..4ff539b65635 100755
+--- src/mpid/ch3/channels/psm/src/psm_entry.c
++++ src/mpid/ch3/channels/psm/src/psm_entry.c
+@@ -21,6 +21,7 @@
+ #include <upmi.h>
+ #include "coll_shmem.h"
+ extern int g_mv2_num_cpus;
++extern int MPIDI_Get_num_nodes();
+ 
+ volatile unsigned int MPIDI_CH3I_progress_completion_count = 0; //ODOT: what is this ?
+ volatile int MPIDI_CH3I_progress_blocked = FALSE;

util-add-missing-include.patch

@@ -0,0 +1,20 @@
+commit e0028839a9bee6996816ae5be43f8a1a7faa6580
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Thu Sep 5 10:00:12 2024 +0200
+
+    util: add missing include
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git src/util/mem/mpit.c src/util/mem/mpit.c
+index 19c2caf27cb3..17f6e6115291 100644
+--- src/util/mem/mpit.c
++++ src/util/mem/mpit.c
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <search.h>
+ #include <stdint.h>
++#include <sys/shm.h>
+ 
+ #ifdef USE_MEMORY_TRACING
+ #   define mpit_malloc(a, line, file)           \