imb-cpp-flags.patch

@@ -1,13 +1,13 @@
---- mpi-benchmarks-IMB-v2021.3.orig/src_cpp/Makefile	2021-10-01 15:09:19.000000000 +0200
-+++ mpi-benchmarks-IMB-v2021.3/src_cpp/Makefile	2022-09-30 11:15:13.866410222 +0200
-@@ -77,8 +77,8 @@
- CXX=mpiicpc
+--- mpi-benchmarks-IMB-v2021.10.orig/src_cpp/Makefile	2021-10-01 15:09:19.000000000 +0200
++++ mpi-benchmarks-IMB-v2021.10/src_cpp/Makefile	2022-09-30 11:15:13.866410222 +0200
+@@ -60,8 +60,8 @@
+ CXX=mpiicpx
  endif
  override CPPFLAGS += -I.
--override CFLAGS += -g -O0 -Wall -Wno-long-long
--override CXXFLAGS += -g -O0 -Wall -Wextra -pedantic -Wno-long-long
-+override CFLAGS += -Wno-long-long
-+override CXXFLAGS +=  -Wno-long-long
+-override CFLAGS += -g -O0 -Wall -Werror
+-override CXXFLAGS += -g -O0 -Wall -Wextra -Werror
++override CFLAGS +=
++override CXXFLAGS +=
  ifdef WITH_OPENMP
- override CFLAGS += -fopenmp
- override CXXFLAGS += -fopenmp
+ ifeq ("$(CXX)",$(filter "$(CXX)", "mpiicpx" "icpx"))
+ override CXXFLAGS += -qopenmp

mpitests.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Fri Oct 31 18:37:34 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Update IMB to 2021.10
+  - Add IMB-RMA-GPU Technical Preview
+  - Add IMB-MPI4 persistent collectives
+  - Migration to icx,icpx compiler
+  - IMB-MPI1: FP16/BF16 data_type support
+  - Change default value for mem_alloc_type to device
+  - Bug fixes
+- Update osu-micro-benchmarks to 7.5.1
+  - See: https://mvapich.cse.ohio-state.edu/static/media/mvapich/CHANGES-OMB.txt
+- Refresh imb-cpp-flags.patch against latest sources
+- Drop patch fixed upstream: osu-fix-bad-return-values.patch
+- Disable 32b builds
+
 -------------------------------------------------------------------
 Fri Aug  1 13:21:10 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
 

mpitests.spec

@@ -39,12 +39,12 @@
 
 %endif
 
-%define osu_ver  6.1
-%define imb_ver  2021.3
+%define osu_ver  7.5.1
+%define imb_ver  2021.10
 %define imb_dir  mpi-benchmarks-IMB-v%{imb_ver}
 %define osu_dir  osu-micro-benchmarks-%{osu_ver}
 
-%define mpi_home %{hpc_mpi_home %flavor}
+%define mpi_home %{hpc_mpi_home}
 %define implem_list_dir %{_datadir}/mpitests/implem.d/
 %define sles_pre_or_15 (0%{?sle_version} > 120000 && 0%{?sle_version} <= 150000)
 %define sles_pre_16 (0%{?sle_version} > 120000 && 0%{?sle_version} < 160000)
@@ -69,8 +69,7 @@ Source4:        mpitests-run.sh
 Source100:      mpitests-rpmlintrc
 Source101:      _multibuild
 Source102:      README.md
-Patch1:         osu-fix-bad-return-values.patch
-Patch2:         imb-cpp-flags.patch
+Patch1:         imb-cpp-flags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dos2unix
 BuildRequires:  gcc-c++
@@ -81,38 +80,22 @@ Requires:       %{flavor}
 BuildRequires:  mpitests = %{version}
 Requires:       mpitests = %{version}
 %endif
-
-%if "%{flavor}" == "mvapich2"
-ExcludeArch:    %{arm}
-%endif
+ExcludeArch:    %{arm}  %ix86
 
 %if "%{flavor}" == "mvapich2-psm2"
 ExclusiveArch:  x86_64
 %endif
 
-%if "%{flavor}" == "mvapich3-ofi"
-ExcludeArch:    %{arm}  %ix86
-%endif
-
-%if "%{flavor}" == "mvapich3-ucx"
-ExcludeArch:    %{arm}  %ix86
-%endif
-
 %if "%{flavor}" == "openmpi4"
-%if %{sles_pre_or_15}
-# Disable openmpi4 builds for SLES up to (including) 15
-ExclusiveArch:  do_not_build
-%else
 ExcludeArch:    ppc64
 %endif
-%endif
 
 %if "%{flavor}" == "openmpi5"
 %if %{sles_pre_16}
 # Disable openmpi5 builds for SLES < 16
 ExclusiveArch:  do_not_build
 %else
-ExcludeArch:    ppc64 %{arm} %ix86
+ExcludeArch:    ppc64
 %endif
 %endif
 
@@ -122,11 +105,12 @@ Set of popular MPI benchmarks: IMB v%{imb_ver} OSU benchmarks ver %{osu_ver}
 %prep
 %setup -c -q
 %setup -T -D -a 1 -q
-%patch -P 1 -p0
-%patch -P 2 -p0
+%autopatch -p0
+
 
 %if "%{flavor}" != ""
 %build
+
 echo echo %{mpi_home}
 . %{mpi_home}/bin/mpivars.sh
 
@@ -135,13 +119,13 @@ export CXXFLAGS="%{optflags}"
 export LDFLAGS="%{optflags}"
 
 # IMB Build
-make  CC=%{mpi_home}/bin/mpicc CXX=%{mpi_home}/bin/mpicxx \
-     -C %{imb_dir}/ all
+make  CC=mpicc CXX=mpicxx \
+     -C %{imb_dir}/ all WITH_OPENMP=1
 
 # OSU Build
 ( cd %{osu_dir} && \
-  ./configure CC=%{mpi_home}/bin/mpicc CXX=%{mpi_home}/bin/mpicxx &&
-  make all )
+  ./configure CC=mpicc CXX=mpicxx &&
+  make all)
 
 %install
 # IMB

osu-fix-bad-return-values.patch

@@ -1,29 +0,0 @@
---- osu-micro-benchmarks-6.1.orig/c/util/osu_util_mpi.c	2022-09-19 15:48:03.000000000 +0200
-+++ osu-micro-benchmarks-6.1/c/util/osu_util_mpi.c	2022-09-30 10:51:18.683964260 +0200
-@@ -211,7 +211,7 @@
-         bad_usage.message = "Please pass a ddt"
-             " type[cont,vect,indx]\n";
-         bad_usage.optarg = optarg;
--        return PO_BAD_USAGE;
-+        return;
-     }
-     option = strtok(optarg, ":");
-     if (0 == strncasecmp(optarg, "vect", 4)) {
-@@ -236,7 +236,7 @@
-         bad_usage.message = "Invalid ddt type. Valid ddt"
-             " types[cont,vect,indx]\n";
-         bad_usage.optarg = optarg;
--        return PO_BAD_USAGE;
-+        return;
-     }
- }
- 
-@@ -2006,7 +2006,7 @@
-     int displacements[OMB_DDT_INDEXED_MAX_LENGTH] = {0};
- 
-     if (0 == options.omb_enable_ddt) {
--        return;
-+        return 0;
-     }
-     switch (options.ddt_type) {
-         case OMB_DDT_CONTIGUOUS: