Commit 240a9441 authored by Philip Carns's avatar Philip Carns

misc cleanups to theta scripts

- fall back to using LIBRARY_PATH to populate LD_LIBRARY_PATH
  (still not clear why rpath doesn't work)
- don't build custom uuid library
parent 9feac7f1
......@@ -8,22 +8,6 @@
# XXX xalt module currently eating '-M' flag for mercury-runner...disabling for now
# module unload xalt
get_pmdk_lib_path() {
module show `spack module tcl find pmem` |&grep LIBRARY_PATH | awk '{print $3}'
}
get_mercury_lib_path() {
module show `spack module tcl find mercury` |&grep LIBRARY_PATH | awk '{print $3}'
}
get_remi_lib_path() {
module show `spack module tcl find remi` |&grep LIBRARY_PATH | awk '{print $3}'
}
get_thallium_lib_path() {
module show `spack module tcl find thallium` |&grep LIBRARY_PATH | awk '{print $3}'
}
module swap PrgEnv-intel PrgEnv-gnu
module load cce
......@@ -33,25 +17,15 @@ spack load -r bake
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.
# update: also happening in other packages that aren't using libtool
LIB_PATH_HACK=$(get_mercury_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
# ditto for pmdk apparently
LIB_PATH_HACK=$(get_pmdk_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
LIB_PATH_HACK=$(get_remi_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
LIB_PATH_HACK=$(get_thallium_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
# NOTE: rpath doesn't seem to be set correctly, and the paths we need are
# in LIBRARY_PATH instead of LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$LIBRARY_PATH
echo "## Bake OFI/GNI:"
hostname
rm -f /dev/shm/foo.dat
bake-mkpool -s 60G /dev/shm/foo.dat
ls -alh /dev/shm/foo.dat
aprun -n 2 -N 1 ./bake-p2p-bw -x 16777216 -m 34359738368 -n "ofi+gni://ipogif0:5000" -p /dev/shm/foo.dat -c 1
echo "## Bake OFI/GNI (8x concurrency):"
......
......@@ -8,22 +8,6 @@
# XXX xalt module currently eating '-M' flag for mercury-runner...disabling for now
# module unload xalt
get_mercury_lib_path() {
module show `spack module tcl find mercury` |&grep LIBRARY_PATH | awk '{print $3}'
}
get_pmdk_lib_path() {
module show `spack module tcl find pmem` |&grep LIBRARY_PATH | awk '{print $3}'
}
get_remi_lib_path() {
module show `spack module tcl find remi` |&grep LIBRARY_PATH | awk '{print $3}'
}
get_thallium_lib_path() {
module show `spack module tcl find thallium` |&grep LIBRARY_PATH | awk '{print $3}'
}
module swap PrgEnv-intel PrgEnv-gnu
module load cce
......@@ -33,19 +17,7 @@ spack load -r bake
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"
# ditto for pmdk and apparently?
LIB_PATH_HACK=$(get_pmdk_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
LIB_PATH_HACK=$(get_remi_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
LIB_PATH_HACK=$(get_thallium_lib_path)
export LD_LIBRARY_PATH="$LIB_PATH_HACK:$LD_LIBRARY_PATH"
echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$LIBRARY_PATH
#ldd ./margo-p2p-latency
......
......@@ -31,6 +31,10 @@ packages:
paths:
cmake@3.5.2: /usr
buildable: False
libuuid:
paths:
libuuid@2.2.9.2: /usr
buildable: False
ssg:
variants: +mpi
libfabric:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment