X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc9e75b689512a9a99f03bfecd2f40d150f303d9..054593cbb260641e7c6f6cc42778898316d3230c:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 2ef275777a..26f9b88255 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -19,23 +19,27 @@ SIMOPTS="--cfg=maxmin/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_ #usage to print the way this script should be called function usage () { - echo "usage:" - echo "$0 [-keep-temps]" - echo " [-np ] -platform -hostfile [-map] program [program-options]" - echo " [-keep-temps] # don't remove the generated files after execution" - echo " [-map] # display the machine on which each process rank is mapped" - echo " [-np ] # use that amount of processes from the hostfile." - echo " # By default, all processes of the hostfile are used." - echo " [-trace] # activate tracing" - echo " [-trace-comment ]# put a comment on the top of the trace file" - echo " [-trace-comment-file ] # put file contents on the top of the trace file as comment" - echo " [-trace-grouped] # group MPI processes by location" - echo " [-trace-resource] # trace resource utilization" - echo " [-trace-triva] # generate configuration for Triva's GraphView" - echo " [-trace-file ] # name of the tracefile (simgrid_smpi.trace)" - echo "or (deprecated usage):" - echo "$0 [-keep-temps] [-np ] [-bandwidth ] [-latency ] program [program-options]" - echo +cat < -hostfile program [program-options] +Options: + -keep-temps # don't remove the generated files after execution + -wrapper # use command to run the program (e.g. "valgrind") + -map # display the machine on which each process rank is mapped + -np # use that amount of processes from the hostfile. + # By default, all processes of the hostfile are used. + -trace # activate tracing + -trace-comment # put a comment on the top of the trace file + -trace-comment-file # put file contents on the top of the trace file as comment + -trace-grouped # group MPI processes by location + -trace-resource # trace resource utilization + -trace-viva # generate configuration for Viva's GraphView + -trace-file # name of the tracefile (simgrid_smpi.trace) + -ext # additional parameter (reserved) + +or (deprecated usage): + $0 [-keep-temps] [-np ] [-bandwidth ] [-latency ] program [program-options] + +EOF } #check if we have at least one parameter @@ -45,6 +49,9 @@ then exit fi +EXTOPT="" +WRAPPER="" + while true; do case "$1" in "-np" | "-n") @@ -76,6 +83,11 @@ while true; do shift 2 ;; + "-ext") + EXTOPT="$2" + shift 2 + ;; + "-map") MAPOPT="true" shift 1 @@ -111,8 +123,8 @@ while true; do shift 1 ;; - "-trace-triva") - TRACE_TRIVA="true" + "-trace-viva") + TRACE_VIVA="true" shift 1 ;; @@ -121,6 +133,11 @@ while true; do shift 1 ;; + "-wrapper") + WRAPPER="$2" + shift 2 + ;; + "-help" | "--help" | "-h") usage exit @@ -139,9 +156,31 @@ while true; do esac done -EXEC="$1" +if [ -n "$WRAPPER" ]; then + EXEC="$WRAPPER $1" +else + EXEC="$1" +fi shift +# steel --cfg and --logs options +while [ $# -gt 0 ]; do + case "$1" in + "--cfg="*|"--log="*) + for OPT in ${1#*=} + do + SIMOPTS="$SIMOPTS ${1%%=*}=$OPT" + done + shift 1 + ;; + *) + PROC_ARGS="${PROC_ARGS:+$PROC_ARGS }$1" + shift + ;; + esac +done + + ##----------------------------------- # Basic checks on the provided arguments @@ -151,14 +190,21 @@ if [ -z "${EXEC}" ] ; then exit 1 fi -if [ -z "${HOSTFILE}" ] ; then - echo "No hostfile specified." +if [ -z "${HOSTFILE}" ] && [ -z "${PLATFORM}" ] ; then + echo "No hostfile nor platform specified." usage exit 1 fi +HOSTFILETMP=0 +if [ -z "${HOSTFILE}" ] ; then + HOSTFILETMP=1 + HOSTFILE="$(mktemp tmphostXXXXXX)" + perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE} +fi + # Don't use wc -l to compute it to avoid issues with trailing \n at EOF -hostfile_procs=`grep -c [a-zA-Z0-9] $HOSTFILE` +hostfile_procs=`grep -c "[a-zA-Z0-9]" $HOSTFILE` if [ -z "${NUMPROCS}" ] ; then # Use the amount of processes in the hostfile as default value for the -np parameter @@ -224,11 +270,14 @@ if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then NUMHOSTS=`cat ${HOSTFILE} | wc -l` fi -if [ ${EXEC} = "./smpi_replay" ]; then - APP_TRACES=$1; - if [ -n "${APP_TRACES}" ] && [ -f ${APP_TRACES} ]; then +if [ "${EXTOPT}" = "smpi_replay" ]; then + APP_TRACES=$PROC_ARGS + if [ -n "${APP_TRACES}" ] && [ -f "${APP_TRACES}" ]; then hosttraces=(`cat ${APP_TRACES} | tr \\\n " "`) NUMTRACES=`cat ${APP_TRACES} | wc -l` + else + printf "File not found: %s\n", "${APP_TRACES:-\${APP_TRACES\}}" >&2 + exit 1 fi fi @@ -270,14 +319,14 @@ do fi echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} - if [ ${EXEC} = "./smpi_replay" ]; then + if [ "${EXTOPT}" = "smpi_replay" ]; then if [ ${NUMTRACES} -gt 1 ]; then echo " " >> ${APPLICATIONTMP} else echo " " >> ${APPLICATIONTMP} fi else - for ARG in $*; do + for ARG in $PROC_ARGS; do echo " " >> ${APPLICATIONTMP} done fi @@ -313,23 +362,29 @@ if [ -n "${TRACE_ACTIVE}" ]; then TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1" fi - if [ -n "${TRACE_TRIVA}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=triva/categorized:smpi_cat.plist --cfg=triva/uncategorized:smpi_uncat.plist" + if [ -n "${TRACE_VIVA}" ]; then + TRACEOPTIONS="${TRACEOPTIONS} --cfg=viva/categorized:smpi_cat.plist --cfg=viva/uncategorized:smpi_uncat.plist" fi fi ##---------------------- end SMPI TRACING OPTIONS --------------------------------- export SMPI_GLOBAL_SIZE=${NUMPROCS} if [ -n "${KEEP}" ] ; then - echo ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP} + echo ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} + if [ ${HOSTFILETMP} = 1 ] ; then + echo "Generated hostfile ${HOSTFILE} keeped." + fi fi -${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP} +${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} status=$? if [ -z "${KEEP}" ] ; then if [ -z "${PLATFORM}" ]; then rm ${PLATFORMTMP} fi + if [ ${HOSTFILETMP} = 1 ] ; then + rm ${HOSTFILE} + fi rm ${APPLICATIONTMP} fi