Update OSU benchmarks to upstream release 5.7.1

Update Intel MPI Benchmarks 2021.2
Resolves: rhbz#1960479

Signed-off-by: Honggang Li <honli@redhat.com>

.gitignore

@@ -5,3 +5,5 @@
 /osu-micro-benchmarks-5.6.2.tar.gz
 /osu-micro-benchmarks-5.6.3.tar.gz
 /osu-micro-benchmarks-5.7.tar.gz
+/osu-micro-benchmarks-5.7.1.tgz
+/IMB-v2021.2.tar.gz

gating.yaml

@@ -2,7 +2,7 @@
 
 product_versions:
 
-  - rhel-8
+  - rhel-9
 
 decision_context: osci_compose_gate
 

mpitests.spec

@@ -1,9 +1,9 @@
-%global intel_mpi_bench_vers IMB-v2019.6
+%global intel_mpi_bench_vers IMB-v2021.2
-%global osu_micro_bench_vers 5.7
+%global osu_micro_bench_vers 5.7.1
 Summary: MPI Benchmarks and tests
 Name: mpitests
-Version: %{osu_micro_bench_vers}
+Version: 5.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: CPL and BSD
 Group: Applications/Engineering
 # These days we get the benchmark soucres from Intel and OSU directly
@@ -11,7 +11,7 @@ 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}.tar.gz
+Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_micro_bench_vers}.tgz
 # Only for old openmpi
 #Patch101: OMB-disable-collective-async.patch
 BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel
@@ -53,10 +53,22 @@ Requires: mvapich2%{?_isa}
 MPI test suite compiled against the mvapich2 package
 %endif
 
+# PSM is x86_64-only
+%ifarch x86_64
+%package mvapich2-psm2
+Summary: MPI tests package compiled against mvapich2 using OmniPath
+Group: Applications
+BuildRequires: mvapich2-psm2-devel >= 2.3-2
+BuildRequires: libpsm2-devel
+Requires: mvapich2-psm2%{?_isa}
+%description mvapich2-psm2
+MPI test suite compiled against the mvapich2 package using OmniPath
+%endif
+
 %prep
 %setup -c 
 %setup -T -D -a 1
-cd osu-micro-benchmarks-%{version}
+cd osu-micro-benchmarks-5.7.1
 cd ..
 
 %build
@@ -97,6 +109,12 @@ do_build
 
 %endif
 
+%ifarch x86_64
+%{_mvapich2_psm2_load}
+do_build
+%{_mvapich2_psm2_unload}
+%endif
+
 %install
 do_install() {
   mkdir -p %{buildroot}$MPI_BIN
@@ -129,6 +147,12 @@ do_install
 %{_mvapich2_unload}
 %endif
 
+%ifarch x86_64
+%{_mvapich2_psm2_load}
+do_install
+%{_mvapich2_psm2_unload}
+%endif
+
 %ifnarch ppc ppc64
 %files openmpi
 %{_libdir}/openmpi/bin/mpitests-*
@@ -142,7 +166,17 @@ do_install
 %{_libdir}/mvapich2/bin/mpitests-*
 %endif
 
+%ifarch x86_64
+%files mvapich2-psm2
+%{_libdir}/mvapich2-psm2/bin/mpitests-*
+%endif
+
 %changelog
+* Tue Jul 20 2021 Honggang Li <honli@redhat.com> - 5.7-3
+- Update OSU benchmarks to upstream release 5.7.1
+- Update Intel MPI Benchmarks 2021.2
+- Resolves: rhbz#1960479
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.7-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 

sources

@@ -1,2 +1,2 @@
-SHA512 (osu-micro-benchmarks-5.7.tar.gz) = 33e0346ec59d7d5df51e8e68408baadbbeaef70df4ba60311df3525290b9ab27542b211694c9143c8e351616a2abe36139d92ca06131ac34dbc882b16a82ed65
+SHA512 (osu-micro-benchmarks-5.7.1.tgz) = 28a1973c6cdca6dada364b17344095dceec83563809320442f375cf20f1975d8a9c03b8586be67360251d86b6fe10b93170094b5d618db59c634665ea13a64e0
-SHA512 (IMB-v2019.6.tar.gz) = 0a43a21afa2c89e11aa582860969ff2acccb0b48e1ba93b78724d74883cf94a058b95d67060450816e63422847a5ebf6fefef5a6a0cdd18ddf2fa392e066ffba
+SHA512 (IMB-v2021.2.tar.gz) = b5aefc74881e6974398b242191a98c3ef22a9e4c53df1b6abbe15f024d79a2590dcfcf5f600a2e9b1ca9594c55add7f5713d0ad844effe4fece46c46dffca403