From 6ba8b75e406dfa678de90254676016a20280e4e3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:03:06 +0000
Subject: import mpitests-5.4.2-1.el7


---

diff --git a/.gitignore b/.gitignore
index 5ad0db5..46f6f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/osu-micro-benchmarks-5.4.tar.gz
-SOURCES/v2018.0.tar.gz
+SOURCES/osu-micro-benchmarks-5.4.2.tar.gz
+SOURCES/v2018.1.tar.gz
diff --git a/.mpitests.metadata b/.mpitests.metadata
index 27857f1..b24328d 100644
--- a/.mpitests.metadata
+++ b/.mpitests.metadata
@@ -1,2 +1,2 @@
-7ee9e2e812b966f468f1a7beda7765fcf5d47a95 SOURCES/osu-micro-benchmarks-5.4.tar.gz
-b0adedaaa0179747918bf6d2a286a80ff8b93428 SOURCES/v2018.0.tar.gz
+532412ecf2e4ddf516913211a34c88452eca9e6b SOURCES/osu-micro-benchmarks-5.4.2.tar.gz
+fae1fb6ddafd9a96ed96a1a04b59293e679bbec6 SOURCES/v2018.1.tar.gz
diff --git a/SPECS/mpitests.spec b/SPECS/mpitests.spec
index 03c9d02..ded56e2 100644
--- a/SPECS/mpitests.spec
+++ b/SPECS/mpitests.spec
@@ -1,23 +1,25 @@
+%global intel_mpi_bench_vers 2018.1
+%global osu_micro_bench_vers 5.4.2
 Summary: MPI Benchmarks and tests
 Name: mpitests
-Version: 5.4
-Release: 2%{?dist}
+Version: %{osu_micro_bench_vers}
+Release: 1%{?dist}
 License: CPL and BSD
 Group: Applications/Engineering
 # These days we get the benchmark soucres from Intel and OSU directly
 # rather than from openfabrics.
 URL: http://www.openfabrics.org
 # https://software.intel.com/en-us/articles/intel-mpi-benchmarks
-Source0: https://github.com/intel/mpi-benchmarks/archive/v2018.0.tar.gz
-Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.4.tar.gz
+Source0: https://github.com/intel/mpi-benchmarks/archive/v%{intel_mpi_bench_vers}.tar.gz
+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
 BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel
 
 %description
 A set of popular MPI benchmarks:
-Intel MPI benchmarks 2018.0.
-OSU micro-benchmarks 5.4.
+Intel MPI benchmarks %{intel_mpi_bench_vers}.
+OSU micro-benchmarks %{osu_micro_bench_vers}.
 
 %package openmpi
 Summary: MPI tests package compiled against openmpi
@@ -140,7 +142,7 @@ MPI test suite compiled against the mvapich23-psm2 package
 %prep
 %setup -c 
 %setup -T -D -a 1
-cd osu-micro-benchmarks-5.4
+cd osu-micro-benchmarks-%{version}
 cd ..
 
 %build
@@ -153,10 +155,10 @@ export F77=mpif77
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 do_build() {
   mkdir build-$MPI_COMPILER
-  cp -al mpi-benchmarks-2018.0 osu-micro-benchmarks-5.4 build-$MPI_COMPILER
-  cd build-$MPI_COMPILER/mpi-benchmarks-2018.0/src
+  cp -al mpi-benchmarks-%{intel_mpi_bench_vers} osu-micro-benchmarks-%{osu_micro_bench_vers} build-$MPI_COMPILER
+  cd build-$MPI_COMPILER/mpi-benchmarks-%{intel_mpi_bench_vers}/src
   make -f make_mpich OPTFLAGS="%{optflags}" MPI_HOME="$MPI_HOME" all
-  cd ../../osu-micro-benchmarks-5.4
+  cd ../../osu-micro-benchmarks-%{osu_micro_bench_vers}
   %configure
   make %{?_smp_mflags}
   cd ../..
@@ -196,10 +198,10 @@ do_build
 
 %{_compat_openmpi16_load}
 mkdir build-$MPI_COMPILER
-cp -al mpi-benchmarks-2018.0 osu-micro-benchmarks-5.4 build-$MPI_COMPILER
-cd build-$MPI_COMPILER/mpi-benchmarks-2018.0/src
+cp -al mpi-benchmarks-%{intel_mpi_bench_vers} osu-micro-benchmarks-%{osu_micro_bench_vers} build-$MPI_COMPILER
+cd build-$MPI_COMPILER/mpi-benchmarks-%{intel_mpi_bench_vers}/src
 make -f make_mpich OPTFLAGS="%{optflags}" MPI_HOME="$MPI_HOME" IMB-MPI1 IMB-EXT IMB-IO
-cd ../../osu-micro-benchmarks-5.4
+cd ../../osu-micro-benchmarks-%{osu_micro_bench_vers}
 patch -p1 < %PATCH101
 %configure
 make %{?_smp_mflags}
@@ -232,12 +234,12 @@ do_build
 %install
 do_install() {
   mkdir -p %{buildroot}$MPI_BIN
-  cd build-$MPI_COMPILER/osu-micro-benchmarks-5.4
+  cd build-$MPI_COMPILER/osu-micro-benchmarks-%{osu_micro_bench_vers}
   make install DESTDIR=%{buildroot}/staging
   find %{buildroot}/staging -name 'osu_*' -type f -perm -111 | while read X; do
     mv $X %{buildroot}$MPI_BIN/mpitests-$(basename $X)
   done
-  cd ../mpi-benchmarks-2018.0/src
+  cd ../mpi-benchmarks-%{intel_mpi_bench_vers}/src
   for X in IMB-*; do
     cp $X %{buildroot}$MPI_BIN/mpitests-$X
   done
@@ -349,6 +351,11 @@ do_install
 %endif
 
 %changelog
+* Thu Jun 28 2018 Jarod Wilson <jarod@redhat.com> - 5.4.2-1
+- Update IMB to 2018.1.
+- Update OMB to 5.4.2.
+- Resolves: rhbz1596385
+
 * Wed Jan 17 2018 Michal Schmidt <mschmidt@redhat.com> - 5.4-2
 - Add a mvapich23-psm subpackage.
 - Resolves: rhbz1536192