Merge branch 'hackathon' of github.com:Azure/azurehpc into hackathon

apps/io500/build_io500.sh

@@ -6,8 +6,10 @@ MODULE_DIR=${SHARED_APP}/modulefiles
 MODULE_NAME=${APP_NAME}
 INSTALL_DIR=${SHARED_APP}/${APP_NAME}
 
+source /etc/profile.d/modules.sh
+
 module load gcc-9.2.0
-module load mpi/mvapich2-2.3.2
+module load mpi/openmpi-4.0.2
 
 function create_modulefile {
 mkdir -p ${MODULE_DIR}

apps/io500/io500.pbs

@@ -1,4 +1,4 @@
-INSTRUCTIONS:
+#INSTRUCTIONS:
 # Edit this file as needed for your machine.
 # It is a simplified version of the site-configs/sandia/startup.sh which include SLURM directives.
 # Most of the variables set in here are needed for io500_fixed.sh which gets sourced at the end of this.
@@ -8,6 +8,8 @@ FILESYSTEM=$FILESYSTEM
 
 set -euo pipefail  # better error handling
 
+export NCORES=`cat $PBS_NODEFILE | wc -l`
+
 io500_ior_easy_size=4000
 io500_ior_hard_writes_per_proc=30000
 
@@ -68,11 +70,11 @@ function setup_paths {
   io500_mdtest_cmd=mdtest
   io500_mdreal_cmd=md-real-io
   io500_mpirun="mpirun"
-  io500_mpiargs="-bind-to hwthread  -env UCX_IB_PKEY=$PKEY"
+  io500_mpiargs="-n \$NCORES --hostfile \$PBS_NODEFILE --bind-to numa"
 }
 
 function setup_ior_easy {
-  #io500_ior_easy_params="-t 2048k -b \${io500_ior_easy_size}m -F"
+  io500_ior_easy_params="-t 2048k"
   echo -n ""
 }
 
@@ -152,6 +154,6 @@ function extra_description {
 export MODULEPATH=/apps/modulefiles:$MODULEPATH
 module load io-500-dev
 module load gcc-9.2.0
-module load mpi/mvapich2-2.3.2
+module load mpi/openmpi-4.0.2
 cd $PBS_O_WORKDIR
 main

apps/io500/parser_io500.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+logfile=
+
+# RESULT
+sed -n -e '/Summary/,$p' $logfile |grep RESULT | sed 's/\[RESULT\]/result valid/g;s/\[RESULT-invalid\]/result invalid/g;s/  */ /g' | jq --slurp --raw-input --raw-output 'split("\n") | map(split(" ")) | .[:-1] | map({"type": .[0], "status": .[1], "test": .[3], "phase": .[4]|tonumber, "test": .[5], "result": .[6]|tonumber, "metric": .[7], "time": .[10]|tonumber})'
+
+# SCORE
+sed -n -e '/Summary/,$p' $logfile |grep SCORE | sed 's/\[SCORE\]/score valid/g;s/\[SCORE-invalid\]/score invalid/g;s/  */ /g' | jq --slurp --raw-input --raw-output 'split("\n") | map(split(" ")) | .[:-1] | map({"type": .[0], "status": .[1], "Bandwidth": .[3]|tonumber, "IOPS": .[7]|tonumber, "Total": .[11]})'

examples/anf_full/config.json

@@ -4,7 +4,7 @@
     "install_from": "headnode",
     "admin_user": "hpcadmin",
     "variables" : {
-        "image" : "OpenLogic:CentOS:7.7:latest",
+        "image" : "OpenLogic:CentOS-HPC:7.7:latest",
         "hpc_image": "OpenLogic:CentOS-HPC:7.7:latest",
         "location": "<NOT-SET>",
         "resource_group": "<NOT-SET>",

examples/lustre_combined/config.json

@@ -13,7 +13,7 @@
     },
     "variables": {
         "resource_group": "<NOT-SET>",
-        "image": "OpenLogic:CentOS:7.6:latest",
+        "image": "OpenLogic:CentOS:7.7:latest",
         "compute_instances": 2,
         "low_priority": false,
         "storage_account": "<NOT-SET>",