From abec7cb5a0244c92968aafed4be1f6ba270d0e366dfd9ac3559f2ab6488a19b1 Mon Sep 17 00:00:00 2001
From: Nicolas Morey <nmorey@suse.com>
Date: Sun, 9 Nov 2025 13:39:07 +0100
Subject: [PATCH] Add mvapich[45] flavors

Signed-off-by: Nicolas Morey <nmorey@suse.com>
---
 _multibuild |  4 ++++
 imb.changes |  5 +++++
 imb.spec    | 23 +++++++++--------------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/_multibuild b/_multibuild
index 1d49c9d..eba3ecf 100644
--- a/_multibuild
+++ b/_multibuild
@@ -3,4 +3,8 @@
   <package>openmpi5</package>
   <package>mpich</package>
   <package>mvapich2</package>
+  <package>mvapich3-ucx</package>
+  <package>mvapich3-ofi</package>
+  <package>mvapich4-ucx</package>
+  <package>mvapich4-ofi</package>
 </multibuild>
diff --git a/imb.changes b/imb.changes
index 5a77a98..c68654c 100644
--- a/imb.changes
+++ b/imb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov  9 12:38:50 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Add mvapich[45] flavors
+
 -------------------------------------------------------------------
 Fri Oct 31 17:01:02 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 
diff --git a/imb.spec b/imb.spec
index f1a95b2..a96d235 100644
--- a/imb.spec
+++ b/imb.spec
@@ -27,27 +27,20 @@
 ExclusiveArch:  do_not_build
 %endif
 
-%if "%{flavor}" == "mvapich2"
-%global mpi_flavor mvapich2
-%define buildtarget "IMB-MPI1 IMB-EXT IMB-IO IMB-P2P"
-%endif
-
-%if "%{flavor}" == "mpich"
-%global mpi_flavor mpich
-%define buildtarget "IMB-MPI1 IMB-EXT IMB-IO IMB-P2P"
-%endif
-
-%if "%{flavor}" == "openmpi4"
+%if "%{flavor}" == "openmpi4" 
 %global mpi_flavor openmpi
 %define mpi_vers 4
 %define buildtarget "IMB-MPI1 IMB-EXT IMB-P2P"
-%endif
-
+%else
 %if "%{flavor}" == "openmpi5"
 %global mpi_flavor openmpi
 %define mpi_vers 5
 %define buildtarget "IMB-MPI1 IMB-EXT IMB-P2P"
-ExcludeArch:    %{ix86} %{arm}
+%else
+# Anything but openmpi[45]
+%global mpi_flavor %{flavor}
+%define buildtarget "IMB-MPI1 IMB-EXT IMB-IO IMB-P2P"
+%endif
 %endif
 
 %define p_bindir /usr/%_lib/mpi/gcc/%{flavor}/bin
@@ -72,6 +65,8 @@ BuildRequires:  %{flavor}-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 Obsoletes:      imb < %{version}
+# Do not bother with 32b versions.
+ExcludeArch:    %{ix86} %{arm}
 
 %description
 The Intel MPI Benchmarks (IMB) perform a set of MPI performance
-- 
2.51.1