Commit f302f55f authored by Ondrej Vysocky's avatar Ondrej Vysocky

ENH removed loading HDEEM module since it is loaded in default and changed...

ENH removed loading HDEEM module since it is loaded in default and changed loading loacation of the scripts #40
parent 820e211c
......@@ -83,9 +83,15 @@ else # PBS
fi
#################################################### run the measurement there #
LOCATION=$( dirname "${BASH_SOURCE[0]}" )
if [ "$LOCATION" == "." ]
then
export $LOCATION=$(pwd)
fi
if $RAPL
then
pdsh -w $NODE_LIST "source /etc/profile.d/10_modules.sh 2>/dev/null; module load x86_adapt 2> /dev/null; module load intel 2> /dev/null; export LD_LIBRARY_PATH+=:/usr/local/lib; $HOME/bin/energyMeasureStart -c $Cfreq -u $Ufreq"
pdsh -w $NODE_LIST "source /etc/profile.d/10_modules.sh 2>/dev/null; module load x86_adapt 2> /dev/null; module load intel 2> /dev/null; export LD_LIBRARY_PATH+=:/usr/local/lib; $LOCATION/energyMeasureStart -c $Cfreq -u $Ufreq"
else #HDEEM
pdsh -w $NODE_LIST "source /etc/profile.d/10_modules.sh 2>/dev/null; stopHdeem; sleep 2; clearHdeem; startHdeem"
fi
......
......@@ -82,11 +82,17 @@ else # PBS
fi
############################# get the results of the measurement for each node #
LOCATION=$( dirname "${BASH_SOURCE[0]}" )
if [ "$LOCATION" == "." ]
then
export $LOCATION=$(pwd)
fi
if $RAPL
then
# source /etc/profile.d/10_modules.sh necessary for Taurus slurm
# loading modules necessary for Salomon cluster
OUTPUT=$(pdsh -w $NODE_LIST -N "source /etc/profile.d/10_modules.sh 2>/dev/null; module load x86_adapt 2> /dev/null; module load intel 2> /dev/null; export LD_LIBRARY_PATH+=:/usr/local/lib; $HOME/bin/energyMeasureStop")
OUTPUT=$(pdsh -w $NODE_LIST -N "source /etc/profile.d/10_modules.sh 2>/dev/null; module load x86_adapt 2> /dev/null; module load intel 2> /dev/null; export LD_LIBRARY_PATH+=:/usr/local/lib; $LOCATION/energyMeasureStop")
TIME=$(grep -oP "(?<=Runtime \[s\] = )\d+\.\d+" <<< $OUTPUT | head -1)
OUTPUT=$(grep -oP "(?<=Energy summary \[J\] = )\d+" <<< $OUTPUT )
......
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