import CS mpitests-7.1-2.el8.1

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/IMB-v2021.3.tar.gz
-SOURCES/osu-micro-benchmarks-5.8.tgz
+SOURCES/osu-micro-benchmarks-7.1-1.tar.gz

.mpitests.metadata

@@ -1,2 +1,2 @@
 54718f6312d64e6500605aadccbbd5461e5ae818 SOURCES/IMB-v2021.3.tar.gz
-eb56cd190fb838b99a9bfcc530005452d81bafb8 SOURCES/osu-micro-benchmarks-5.8.tgz
+8c9a1e9761af580b3bcfc6f60c73d7c697c62807 SOURCES/osu-micro-benchmarks-7.1-1.tar.gz

SOURCES/0001-Avoid-build-failure-for-i386.patch

@@ -0,0 +1,28 @@
+From eeccd454f9dc8b528be706b887f246e82a19d127 Mon Sep 17 00:00:00 2001
+From: Kamal Heib <kheib@redhat.com>
+Date: Mon, 10 Jul 2023 13:15:27 -0400
+Subject: [PATCH] Avoid build failure for i386
+
+Signed-off-by: Kamal Heib <kheib@redhat.com>
+---
+ c/util/osu_util_validation.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/c/util/osu_util_validation.c b/c/util/osu_util_validation.c
+index c2cd1fa14c1c..b0e1641b1863 100644
+--- a/c/util/osu_util_validation.c
++++ b/c/util/osu_util_validation.c
+@@ -299,8 +299,10 @@ static int atom_binary_compare(MPI_Datatype dtype, void *a, void *b)
+             return COMPARE_AS_TYPE(__int32_t, a, b);
+         case 8:
+             return COMPARE_AS_TYPE(__int64_t, a, b);
++#ifndef __i386__
+         case 16:
+             return COMPARE_AS_TYPE(__int128_t, a, b);
++#endif
+     }
+     return 0;
+ }
+-- 
+2.41.0
+

SPECS/mpitests.spec

@@ -1,9 +1,9 @@
 %global intel_mpi_bench_vers IMB-v2021.3
-%global osu_micro_bench_vers 5.8
+%global osu_micro_bench_vers 7.1-1
 Summary: MPI Benchmarks and tests
 Name: mpitests
-Version: 5.8
-Release: 1%{?dist}
+Version: 7.1
+Release: 2%{?dist}.1
 License: CPL and BSD
 Group: Applications/Engineering
 # These days we get the benchmark soucres from Intel and OSU directly
@@ -11,9 +11,10 @@ Group: Applications/Engineering
 URL: http://www.openfabrics.org
 # https://software.intel.com/en-us/articles/intel-mpi-benchmarks
 Source0: https://github.com/intel/mpi-benchmarks/archive/%{intel_mpi_bench_vers}.tar.gz
-Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_micro_bench_vers}.tgz
+Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_micro_bench_vers}.tar.gz
 # Only for old openmpi
 #Patch101: OMB-disable-collective-async.patch
+Patch0001: 0001-Avoid-build-failure-for-i386.patch
 BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel
 BuildRequires: automake, autoconf, libtool
 BuildRequires: gcc, gcc-c++
@@ -68,7 +69,8 @@ MPI test suite compiled against the mvapich2 package using OmniPath
 %prep
 %setup -c 
 %setup -T -D -a 1
-cd osu-micro-benchmarks-5.8
+cd osu-micro-benchmarks-7.1-1
+%patch0001 -p1
 cd ..
 
 %build
@@ -172,6 +174,19 @@ do_install
 %endif
 
 %changelog
+* Tue Jul 11 2023 Kamal Heib <kheib@redhat.com> - 7.1-2.1
+- Avoid build failure for i386 arch
+- Resolves: rhbz#2220949
+
+* Tue Jul 11 2023 Kamal Heib <kheib@redhat.com> - 7.1-2
+- Avoid build failure for i686
+- Resolves: rhbz#2220949
+
+* Thu Jul 06 2023 Kamal Heib <kheib@redhat.com> - 7.1-1
+- Update OSU benchmarks ito upstream release 7.1
+- Add gating tests.
+- Resolves: rhbz#2220949
+
 * Fri Dec 10 2021 Honggang Li <honli@redhat.com> - 5.8-1
 - Update OSU benchmarks to upstream release 5.8
 - Update Intel MPI Benchmarks 2021.3