X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f121073f78d7355aba33a0be821b7d625e8d20a0..47c08390d2f3cee84c293760341ac34e86c5de94:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 677f9322dc..ef6b063108 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -13,7 +13,6 @@ 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" @@ -21,15 +20,21 @@ 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 [-quiet] [-keep-temps]" + 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 [-quiet] [-keep-temps] [-np ] [-bandwidth ] [-latency ] program [program-options]" + echo "$0 [-keep-temps] [-np ] [-bandwidth ] [-latency ] program [program-options]" echo } @@ -56,7 +61,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,7 +69,7 @@ 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 @@ -77,8 +82,18 @@ while true; do ;; "-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") @@ -129,16 +144,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 +224,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 + hosttraces=(`cat ${APP_TRACES} | tr \\\n " "`) + NUMTRACES=`cat ${APP_TRACES} | wc -l` + 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 +268,19 @@ do else host="${hostnames[$j]}" fi - echo " " >> ${APPLICATIONTMP} + echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} - for ARG in $*; do - echo " " >> ${APPLICATIONTMP} - done + if [ "${EXEC}" = "./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 +297,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 @@ -269,6 +324,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 +332,5 @@ if [ -z "${KEEP}" ] ; then fi rm ${APPLICATIONTMP} fi + +exit $status