Update OSUMicroBenchmarks recipe to MVAPICH-2.3.2

recipes/OSUMicroBenchmarks-Infiniband-MVAPICH/README.md

@@ -19,7 +19,7 @@ The pool configuration should enable the following properties:
   * `platform_image` must be defined
     * `publisher` must be set to `OpenLogic`
     * `offer` must be set to `CentOS-HPC`
-    * `sku` must be set to `7.6`
+    * `sku` must be set to `7.6` or later
 * `vm_size` must be set to an SR-IOV RDMA compatible VM size such as
 `STANDARD_HB60rs` or `STANDARD_HC44rs`
 
@@ -27,17 +27,15 @@ The pool configuration should enable the following properties:
 The global configuration should set the following properties:
 * `singularity_images` array have a reference to a valid OSU
 Micro-Benchmark image with MVAPICH. This can be
-`library://alfpark/mvapich/mvapich:2.3.1`
+`library://alfpark/mvapich/mvapich:2.3.2`
 
 ### Jobs Configuration
 The jobs configuration should set the following properties within the `tasks`
 array which should have a task definition containing:
 * `singularity_iamge` should be the name of the Singularity image for this
 container task invocation. For this example, this should be
-`library://alfpark/mvapich/mvapich:2.3.1`.
+`library://alfpark/mvapich/mvapich:2.3.2`.
 * `environment_variables` are the environment variables to set
-    * `HOST_MVAPICH_VERSION` is the MVAPICH version on the host that can be
-      loaded by the environment modules system.
     * `BENCHMARK` is the OSU benchmark to execute
     * `BENCHMARK_ARGS` are any arguments to pass to the benchmark executable
 * `command` should contain the command to pass to the `mpirun` invocation.

recipes/OSUMicroBenchmarks-Infiniband-MVAPICH/config/config.yaml

@@ -3,4 +3,4 @@ batch_shipyard:
 global_resources:
   singularity_images:
     unsigned:
-      - library://alfpark/mvapich/mvapich:2.3.1
+      - library://alfpark/mvapich/mvapich:2.3.2

recipes/OSUMicroBenchmarks-Infiniband-MVAPICH/config/jobs.yaml

@@ -1,9 +1,8 @@
 job_specifications:
 - id: osu-benchmark
   tasks:
-  - singularity_image: library://alfpark/mvapich/mvapich:2.3.1
+  - singularity_image: library://alfpark/mvapich/mvapich:2.3.2
     environment_variables:
-      HOST_MVAPICH_VERSION: 2.3.1
       BENCHMARK: collective/osu_allreduce
       BENCHMARK_ARGS: -f
     multi_instance:
@@ -11,5 +10,5 @@ job_specifications:
       mpi:
         runtime: mvapich
         processes_per_node: 1
-      pre_execution_command: module load mpi/mvapich2-${HOST_MVAPICH_VERSION}
+      pre_execution_command: module load mpi/mvapich2
     command: /bin/bash -c "cd /usr/local/libexec/osu-micro-benchmarks/mpi; ./${BENCHMARK} ${BENCHMARK_ARGS}"

recipes/OSUMicroBenchmarks-Infiniband-MVAPICH/singularity/osubench.def

@@ -9,10 +9,10 @@ yum install -y \
 yum groupinstall -y "Development tools"
 # Install MOFED
 cd /tmp
-curl -fSsL http://www.mellanox.com/downloads/ofed/MLNX_OFED-4.6-1.0.1.1/MLNX_OFED_LINUX-4.6-1.0.1.1-rhel7.6-x86_64.tgz | tar -zxpf -
-./MLNX_OFED_LINUX-4.6-1.0.1.1-rhel7.6-x86_64/mlnxofedinstall --user-space-only --without-fw-update --all --force
+curl -fSsL http://www.mellanox.com/downloads/ofed/MLNX_OFED-4.7-1.0.0.1/MLNX_OFED_LINUX-4.7-1.0.0.1-rhel7.6-x86_64.tgz | tar -zxpf -
+./MLNX_OFED_LINUX-4.7-1.0.0.1-rhel7.6-x86_64/mlnxofedinstall --user-space-only --without-fw-update --all --force
 # Install MVAPICH
-MVAPICH_VERSION=2.3.1
+MVAPICH_VERSION=2.3.2
 curl -fSsL http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-${MVAPICH_VERSION}.tar.gz | tar -zxpf -
 cd mvapich2-${MVAPICH_VERSION}
 ./configure --enable-g=none --enable-fast=yes