X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a85110a0cc574b70238ac058937989e573434f88..d947ff7466b473eeec602007934f8336a9b17f3c:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index ad8295b63e..bdede7a838 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -13,24 +13,32 @@ LOOPBACK_BANDWIDTH="${DEFAULT_LOOPBACK_BANDWIDTH}" LOOPBACK_LATENCY="${DEFAULT_LOOPBACK_LATENCY}" NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}" NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}" -NUMPROCS="${DEFAULT_NUMPROCS}" POWER="${DEFAULT_POWER}" SIMOPTS="--cfg=maxmin/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304" #usage to print the way this script should be called function usage () { - echo "usage:" - echo "$0 [-quiet] [-keep-temps]" - echo " [-np ] -platform -hostfile [-map] program [program-options]" - echo " [-trace] # activate tracing" - 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 [-quiet] [-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 + -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 @@ -40,6 +48,8 @@ then exit fi +EXTOPT="" + while true; do case "$1" in "-np" | "-n") @@ -56,7 +66,7 @@ while true; do ;; "-platform") PLATFORM="$2" - if [ ! -f ${PLATFORM} ]; then + if [ ! -f "${PLATFORM}" ]; then echo "[$0] ** error: the file '${PLATFORM}' does not exist. Aborting." exit 1 fi @@ -64,21 +74,36 @@ while true; do ;; "-hostfile") HOSTFILE="$2" - if [ ! -f ${HOSTFILE} ]; then + if [ ! -f "${HOSTFILE}" ]; then echo "[$0] ** error: the file '${HOSTFILE}' does not exist. Aborting." exit 1 fi shift 2 ;; + "-ext") + EXTOPT="$2" + shift 2 + ;; + "-map") MAPOPT="true" shift 1 ;; "-trace") - TRACE_ACTIVE="true" - shift 1 + TRACE_ACTIVE="true" + shift 1 + ;; + + "-trace-comment") + TRACE_COMMENT="$2" + shift 2 + ;; + + "-trace-comment-file") + TRACE_COMMENT_FILE="$2" + shift 2 ;; "-trace-file") @@ -96,8 +121,8 @@ while true; do shift 1 ;; - "-trace-triva") - TRACE_TRIVA="true" + "-trace-viva") + TRACE_VIVA="true" shift 1 ;; @@ -129,16 +154,32 @@ shift ##----------------------------------- -# test if we have something to execute, otherwise show usage and exit -if [ -z ${EXEC} ] -then - echo "Program is missing" +# Basic checks on the provided arguments +if [ -z "${EXEC}" ] ; then + echo "You must provide a program to execute." + usage + exit 1 +fi + +if [ -z "${HOSTFILE}" ] ; then + echo "No hostfile specified." usage exit 1 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` + +if [ -z "${NUMPROCS}" ] ; then + # Use the amount of processes in the hostfile as default value for the -np parameter + NUMPROCS=$hostfile_procs +fi +if [ ${NUMPROCS} -gt ${hostfile_procs} ] ; then + echo "You requested to use ${NUMPROCS} processes, but there is only ${hostfile_procs} processes in your hostfile..." >&2 +fi + ##-------------------------------- DEFAULT or SPECIFIED PLATFORM -------------------------------------- if [ -z "${PLATFORM}" ]; then PLATFORMTMP="$(mktemp tmpXXXXXX)" @@ -193,6 +234,17 @@ if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then NUMHOSTS=`cat ${HOSTFILE} | wc -l` fi +if [ "${EXTOPT}" = "smpi_replay" ]; then + APP_TRACES=$1; + 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 + ##---------------------------------------------------------- ## generate application.xml with hostnames from hostfile: ## the name of host_i (1<=i<=p, where -np p) is the line i @@ -229,11 +281,19 @@ do else host="${hostnames[$j]}" fi - echo " " >> ${APPLICATIONTMP} + echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} - for ARG in $*; do - echo " " >> ${APPLICATIONTMP} - done + if [ "${EXTOPT}" = "smpi_replay" ]; then + if [ ${NUMTRACES} -gt 1 ]; then + echo " " >> ${APPLICATIONTMP} + else + echo " " >> ${APPLICATIONTMP} + fi + else + for ARG in $*; do + echo " " >> ${APPLICATIONTMP} + done + fi echo " " >> ${APPLICATIONTMP} done @@ -250,6 +310,14 @@ if [ -n "${TRACE_ACTIVE}" ]; then fi TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1" + if [ -n "${TRACE_COMMENT}" ]; then + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/comment:${TRACE_COMMENT}" + fi + + if [ -n "${TRACE_COMMENT_FILE}" ]; then + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/comment_file:${TRACE_COMMENT_FILE}" + fi + if [ -n "${TRACE_GROUPED}" ]; then TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:1" fi @@ -258,8 +326,8 @@ 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 --------------------------------- @@ -269,6 +337,7 @@ if [ -n "${KEEP}" ] ; then echo ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP} fi ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP} +status=$? if [ -z "${KEEP}" ] ; then if [ -z "${PLATFORM}" ]; then @@ -276,3 +345,5 @@ if [ -z "${KEEP}" ] ; then fi rm ${APPLICATIONTMP} fi + +exit $status