random regression test script cleanups

tests/perf-regression/cooley/run-regression.sh

@@ -124,7 +124,7 @@ echo "=== BUILDING MERCURY-RUNNER BENCHMARK ==="
 cd $SANDBOX/mercury-runner
 mkdir build
 cd build
-CC=mpicc CXX=mpicxx CXXFLAGS='-D__STDC_FORMAT_MACROS' cmake -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=/$PREFIX -DMPI=ON ..
+CC=mpicc CXX=mpicxx CXXFLAGS='-D__STDC_FORMAT_MACROS' cmake -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_INSTALL_PREFIX=$PREFIX -DMPI=ON ..
 make -j 3
 make install
 

tests/perf-regression/theta/margo-p2p-latency.qsub

@@ -6,21 +6,21 @@
 #COBALT -q debug-flat-quad
 #COBALT -M carns@mcs.anl.gov
 
-echo "MPI (one way, double the latency for round trip):"
+echo "## MPI (one way, double the latency for round trip):"
 aprun -n 2 -N 1 ./osu_latency
 
-echo "Margo OFI/GNI (round trip):"
+echo "## Margo OFI/GNI (round trip):"
 aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+gni://ipogif0:5000
-echo "Margo BMI/TCP (round trip):"
+echo "## Margo BMI/TCP (round trip):"
 aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n bmi+tcp://
-echo "WARNING: Margo OFI/TCP (disabled because it hangs as of 8/10/2017)"
+echo "## WARNING: Margo OFI/TCP (disabled because it hangs as of 8/10/2017)"
 # aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+tcp://ipogif0:5000
 
 # figure out nodes and hostnames for use with fi_
 declare -a nodes=($(python /lus/theta-fs0/home/pershey/harness_workspace/bin/run_on_all_nids.py));
 server_hostname=$(printf "nid%05d\n" ${nodes[0]})
 
-echo "fi_pingpong OFI/GNI (one way, double the usec/xfer for round trip):"
+echo "## fi_pingpong OFI/GNI (one way, double the usec/xfer for round trip):"
 aprun -n 1 -N 1 -L ${nodes[0]} -b -p carns-test ./fi_pingpong -p gni -S 1 -I 10000 > $COBALT_JOBID.fi_pingpong_server.log &
 sleep 5
 aprun -n 1 -N 1 -L ${nodes[1]} -b -p carns-test ./fi_pingpong -p gni -S 1 -I 10000 $server_hostname > $COBALT_JOBID.fi_pingpong_client.log &
@@ -29,6 +29,6 @@ wait
 cat $COBALT_JOBID.fi_pingpong_client.log
 
 # one more margo run, this time with diagnostics enabled
-echo "Margo OFI/GNI (round trip) with diagnostics:"
+echo "## Margo OFI/GNI (round trip) with diagnostics:"
 aprun -n 2 -N 1 ./margo-p2p-latency -i 100000 -n ofi+gni://ipogif0:5000 -d $COBALT_JOBID.diag
 

tests/perf-regression/theta/run-regression.sh

@@ -85,6 +85,7 @@ make install
 # mercury
 echo "=== BUILDING MERCURY ==="
 cd $SANDBOX/mercury
+git submodule update --init
 mkdir build
 cd build
 cmake -DNA_USE_BMI:BOOL=ON -DBMI_INCLUDE_DIR:PATH=$PREFIX/include -DBMI_LIBRARY:FILEPATH=$PREFIX/lib/libbmi.so -DNA_USE_OFI:BOOL=ON -DMERCURY_USE_BOOST_PP:BOOL=ON -DCMAKE_INSTALL_PREFIX=/$PREFIX -DBUILD_SHARED_LIBS:BOOL=ON -DMERCURY_USE_SELF_FORWARD:BOOL=ON -DNA_USE_SM:BOOL=ON ../