correctly working theta regression test with spack

perf-regression/theta/margo-regression-spack.qsub

@@ -7,7 +7,14 @@
 #COBALT -M carns@mcs.anl.gov
 
 # XXX xalt module currently eating '-M' flag for mercury-runner...disabling for now
-module unload xalt
+# module unload xalt
+
+get_mercury_lib_path() {
+        module show `spack module tcl find mercury` |&grep LIBRARY_PATH | awk '{print $3}'
+}
+
+module swap PrgEnv-intel PrgEnv-gnu
+module load cce
 
 export SPACK_SHELL=bash
 . $SANDBOX/spack/share/spack/setup-env.sh
@@ -15,6 +22,13 @@ spack load -r ssg
 
 module list
 
+# NOTE: as of Sept 2018, the rpath isn't being set correctly for Mercury libraries in the regression
+#       test programs.  Not sure why.  This hack manually adds the correct path to LD_LIBRARY_PATH.
+LIB_PATH_HACK=$(get_mercury_lib_path)
+export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
+echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
+ldd ./margo-p2p-latency
+
 # NOTE: needed as of January 2018 to avoid conflicts between MPI and 
 #       libfabric GNI provider
 # NOTE: doing this with -e option to aprun

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

@@ -31,7 +31,7 @@ cp margo-regression-spack.qsub $JOBDIR
 cd $SANDBOX
 git clone https://github.com/spack/spack.git
 git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git
-git clone https://xgitlab.cels.anl.gov/sds/ssg.git
+git clone https://xgitlab.cels.anl.gov/sds/sds-tests.git
 wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.2.tar.gz
 tar -xvzf osu-micro-benchmarks-5.3.2.tar.gz
 git clone https://github.com/pdlfs/mercury-runner.git
@@ -59,16 +59,15 @@ spack load -r ssg
 # make -j 3
 # make install
 
-# ssg
-echo "=== BUILDING SSG TEST PROGRAMS ==="
-cd $SANDBOX/ssg
+# sds-tests
+echo "=== BUILDING SDS TEST PROGRAMS ==="
+cd $SANDBOX/sds-tests
 libtoolize
 ./prepare.sh
 mkdir build
 cd build
 ../configure --prefix=$PREFIX CC=cc
 make -j 3
-make tests
 make install
 
 # mercury-runner benchmark
@@ -82,12 +81,12 @@ make install
 
 # set up job to run
 echo "=== SUBMITTING AND WAITING FOR JOB ==="
-cp $SANDBOX/ssg/build/tests/perf-regression/.libs/margo-p2p-latency $JOBDIR
-cp $SANDBOX/ssg/build/tests/perf-regression/.libs/margo-p2p-bw $JOBDIR
+cp $PREFIX/bin/margo-p2p-latency $JOBDIR
+cp $PREFIX/bin/margo-p2p-bw $JOBDIR
 # cp $PREFIX/libexec/osu-micro-benchmarks/mpi/pt2pt/osu_latency $JOBDIR
 # cp $PREFIX/bin/mercury-runner $JOBDIR
 cd $JOBDIR
-JOBID=`qsub --env LD_LIBRARY_PATH=$PREFIX/lib --env SANDBOX=$SANDBOX ./margo-regression-spack.qsub`
+JOBID=`qsub --env SANDBOX=$SANDBOX ./margo-regression-spack.qsub`
 cqwait $JOBID
 
 echo "=== JOB DONE, COLLECTING AND SENDING RESULTS ==="