X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b481f5cc7076aa751d9269d53066b77209683901..525d97269d34d637e41ee01efa718d2081b4dd83:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 7ec37c6eb5..45f830bcbb 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -1,4 +1,4 @@ -#!/bin/bash +#! /bin/sh @CMAKE_SMPI_COMMAND@ @@ -18,22 +18,29 @@ 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 " [-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-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 +usage () { +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-ti # activate time independant tracing (for replay, default in smpi_simgrid.txt) + -trace # activate tracing (Paje, default in smpi_simgrid.trace) + -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 @@ -43,6 +50,10 @@ then exit fi +EXTOPT="" +WRAPPER="" +HOSTFILE="" + while true; do case "$1" in "-np" | "-n") @@ -59,7 +70,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 @@ -67,21 +78,51 @@ 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 ;; + "-machinefile") + HOSTFILE="$2" + 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-ti") + TRACE_ACTIVE="true" + TRACE_TI_ACTIVE="true" + shift 1 + ;; + + "-trace-comment") + TRACE_COMMENT="$2" + shift 2 + ;; + + "-trace-comment-file") + TRACE_COMMENT_FILE="$2" + shift 2 ;; "-trace-file") @@ -99,8 +140,8 @@ while true; do shift 1 ;; - "-trace-triva") - TRACE_TRIVA="true" + "-trace-viva") + TRACE_VIVA="true" shift 1 ;; @@ -109,6 +150,11 @@ while true; do shift 1 ;; + "-wrapper") + WRAPPER="$2" + shift 2 + ;; + "-help" | "--help" | "-h") usage exit @@ -127,36 +173,73 @@ 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 -if [ -z ${EXEC} ] ; then - echo "You must provide a program to execute." + +if [ -z "${HOSTFILE}" ] && [ -z "${PLATFORM}" ] ; then + echo "No hostfile nor platform specified." usage exit 1 fi -if [ -z ${HOSTFILE} ] ; then - echo "No hostfile specified." - usage - exit 1 +HOSTFILETMP=0 +if [ -z "${HOSTFILE}" ] ; then + HOSTFILETMP=1 + HOSTFILE="$(mktemp tmphostXXXXXX)" + perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE} +fi +UNROLLEDHOSTFILETMP=0 + +#parse if our lines are terminated by :num_process +multiple_processes=`grep -c ":" $HOSTFILE` +if [ "${multiple_processes}" -gt 0 ] ; then + UNROLLEDHOSTFILETMP=1 + UNROLLEDHOSTFILE="$(mktemp tmphostXXXXXX)" + perl -ne ' do{ for ( 1 .. $2 ) { print "$1\n" } } if /(.*?):(\d+).*/' ${HOSTFILE} > ${UNROLLEDHOSTFILE} + if [ ${HOSTFILETMP} = 1 ] ; then + rm ${HOSTFILE} + HOSTFILETMP=0 + fi + HOSTFILE=$UNROLLEDHOSTFILE 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 +if [ -z "${NUMPROCS}" ] ; then # Use the amount of processes in the hostfile as default value for the -np parameter - NUMPROC=$hostfile_procs + 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..." - exit 1 +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 -------------------------------------- @@ -170,20 +253,26 @@ if [ -z "${PLATFORM}" ]; then PLATFORMHEAD -for (( i=${NUMPROCS}; $i ; i=$i-1 )) do +i=${NUMPROCS} +while [ $i -gt 0 ]; do echo " " >> ${PLATFORMTMP} echo " " >> ${PLATFORMTMP} echo " " >> ${PLATFORMTMP} + i=$((i - 1)) done -for (( i=${NUMPROCS}; $i ; i=$i-1 )) do - for (( j=${NUMPROCS}; $j ; j=$j-1 )) do +i=${NUMPROCS} +while [ $i -gt 0 ]; do + j=${NUMPROCS} + while [ $j -gt 0 ]; do if [ $i -eq $j ]; then echo " " >> ${PLATFORMTMP} else echo " " >> ${PLATFORMTMP} fi + j=$((j - 1)) done + i=$((i - 1)) done cat >> ${PLATFORMTMP} <&2 + exit 1 + fi fi ##---------------------------------------------------------- @@ -237,23 +337,31 @@ fi for i in ${SEQ} do if [ -n "${HOSTFILE}" ]; then - j=$(( $i % ${NUMHOSTS} )) + j=$(( $i % ${NUMHOSTS} + 1 )) fi ##---- optional display of ranks to process mapping if [ -n "${MAPOPT}" ]; then - echo "[rank $i] -> ${hostnames[$j]}" + echo "[rank $i] -> $(echo $hostnames|cut -d' ' -f$j)" fi - if [ -z "${hostnames[$j]}" ]; then - host="host"$(($j+1)) + if [ -z "$(echo $hostnames|cut -d' ' -f$j)" ]; then + host="host"$($j) else - host="${hostnames[$j]}" + host="$(echo $hostnames|cut -d' ' -f$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 $PROC_ARGS; do + echo " " >> ${APPLICATIONTMP} + done + fi echo " " >> ${APPLICATIONTMP} done @@ -265,36 +373,63 @@ APPLICATIONFOOT ##---------------------- SMPI TRACING OPTIONS --------------------------------- if [ -n "${TRACE_ACTIVE}" ]; then #define trace filename - if [ -z "${TRACE_FILENAME}" ]; then - TRACE_FILENAME="smpi_simgrid.trace" + if [ -n "${TRACE_TI_ACTIVE}" ]; then + if [ -z "${TRACE_FILENAME}" ]; then + TRACE_FILENAME="smpi_simgrid.txt" + fi + TRACEOPTIONS="--cfg=tracing:yes --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:yes --cfg=tracing/smpi/format:TI --cfg=tracing/smpi/computing:yes" + else + if [ -z "${TRACE_FILENAME}" ]; then + TRACE_FILENAME="smpi_simgrid.trace" + fi + TRACEOPTIONS="--cfg=tracing:yes --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:yes" + fi + + 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 - TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1" if [ -n "${TRACE_GROUPED}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:1" + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:yes" fi if [ -n "${TRACE_RESOURCE}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1" + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes" 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 + if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then + echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} 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 + if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then + rm ${UNROLLEDHOSTFILE} + fi rm ${APPLICATIONTMP} fi