X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..b209fd002b9ef31307f6f604254ad84a6628d5b0:/src/smpi/smpirun.in diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index 0067427d4d..28ae8b0829 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -1,7 +1,6 @@ #! /bin/sh -# Copyright (c) 2007-2015. The SimGrid Team. -# All rights reserved. +# Copyright (c) 2007-2016, The SimGrid Team. All rights reserved. # This program is free software; you can redistribute it and/or modify it # under the terms of the license (GNU LGPL) which comes with this package. @@ -24,7 +23,9 @@ NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}" NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}" SPEED="${DEFAULT_SPEED}" -SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304" +PRIVATIZE="--cfg=smpi/privatize-global-variables:yes" + +SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP-gamma:4194304" #usage to print the way this script should be called usage () { @@ -36,6 +37,7 @@ Options: -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. + -no-privatize # Disable the globals privatization, that is activated by default -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 @@ -66,6 +68,8 @@ EXTOPT="" WRAPPER="" HOSTFILE="" HOSTFILETMP=0 +MAPOPT=0 +REPLAY=0 unset pid @@ -147,7 +151,6 @@ while true; do fi shift 2 ;; - "-machinefile") HOSTFILE="$2" if [ ! -f "${HOSTFILE}" ]; then @@ -156,83 +159,71 @@ while true; do fi shift 2 ;; - "-ext") EXTOPT="$2" shift 2 ;; - + "-no-privatize") + PRIVATIZE="" + shift 1 + ;; "-map") - MAPOPT="true" + MAPOPT=1 shift 1 ;; - "-trace") 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") TRACE_FILENAME="$2" shift 2 ;; - "-trace-grouped") TRACE_GROUPED="true" shift 1 ;; - "-trace-resource") TRACE_RESOURCE="true" shift 1 ;; - "-trace-viva") TRACE_VIVA="true" shift 1 ;; - "-keep-temps") KEEP="true" shift 1 ;; - "-wrapper") WRAPPER="$2" shift 2 ;; - "-help" | "--help" | "-h") usage exit 0 ;; - "-version" | "--version" | "-v") printf '%b\n' "$SIMGRID_VERSION" exit 0 ;; - "-git-version" | "--git-version") printf '%b\n' "$SIMGRID_GITHASH" exit 0 ;; - "--cfg="*|"--log="*) for OPT in ${1#*=} do @@ -250,6 +241,13 @@ while true; do esac done +# check if we still have at least one parameter beyond options +if [ $# -eq 0 ] +then + usage + exit +fi + if [ -n "$WRAPPER" ]; then EXEC="$WRAPPER $1" else @@ -274,10 +272,6 @@ while [ $# -gt 0 ]; do esac done - -##----------------------------------- - - if [ -z "${HOSTFILE}" ] && [ -z "${PLATFORM}" ] ; then echo "No hostfile nor platform specified." usage @@ -300,7 +294,7 @@ if [ -z "${HOSTFILE}" ] ; then } } } elsif (/> ${HOSTFILE} fi UNROLLEDHOSTFILETMP=0 @@ -318,7 +312,6 @@ if [ "${multiple_processes}" -gt 0 ] ; then 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` if [ ${hostfile_procs} = 0 ] ; then @@ -331,7 +324,6 @@ if [ -z "${NUMPROCS}" ] ; then 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 @@ -378,12 +370,10 @@ else PLATFORMTMP=${PLATFORM} fi ##-------------------------------- end DEFAULT or SPECIFIED PLATFORM -------------------------------------- - ##-------------------------------- DEFAULT APPLICATION -------------------------------------- APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)" #APPLICATIONTMP="app.xml" - cat > ${APPLICATIONTMP} < @@ -401,6 +391,7 @@ if [ "${EXTOPT}" = "smpi_replay" ]; then if [ -n "${APP_TRACES}" ] && [ -f "${APP_TRACES}" ]; then hosttraces=$(cat ${APP_TRACES} | tr '\n\r' ' ' ) NUMTRACES=$(cat ${APP_TRACES} | wc -l) + REPLAY=1 else printf "File not found: %s\n" "${APP_TRACES:-\${APP_TRACES\}}" >&2 exit 1 @@ -409,8 +400,7 @@ fi ##---------------------------------------------------------- ## generate application.xml with hostnames from hostfile: -## the name of host_i (1<=i<=p, where -np p) is the line i -## in hostfile (where -hostfile hostfile), or "host$i" if +## the name of host_i (1<=i<=p, where -np p) is the line i in hostfile (where -hostfile hostfile), or "host$i" if ## hostfile has less than i lines. ##---------------------------------------------------------- @@ -426,36 +416,36 @@ else done fi +set -- $hostnames + ##---- generate tags------------------------------ +#prepare arguments at once +for ARG in $PROC_ARGS; do + XML_ARGS="${XML_ARGS}"" +" +done for i in ${SEQ} do - if [ -n "${HOSTFILE}" ]; then - j=$(( $i % ${NUMHOSTS} + 1 )) - fi + j=$(( $i % ${NUMHOSTS} + 1 )) + host=$(eval "echo \${$j}") + ##---- optional display of ranks to process mapping - if [ -n "${MAPOPT}" ]; then - echo "[rank $i] -> $(echo $hostnames|cut -d' ' -f$j)" + if [ ${MAPOPT} = 1 ]; then + echo "[rank $i] -> $host" fi - if [ -z "$(echo $hostnames|cut -d' ' -f$j)" ]; then - host="host"$($j) - else - host="$(echo $hostnames|cut -d' ' -f$j)" - fi - echo " " >> ${APPLICATIONTMP} - echo " " >> ${APPLICATIONTMP} - echo " " >> ${APPLICATIONTMP} - if [ "${EXTOPT}" = "smpi_replay" ]; then + echo " + + " >> ${APPLICATIONTMP} + if [ ${REPLAY} = 1 ]; then if [ ${NUMTRACES} -gt 1 ]; then echo " " >> ${APPLICATIONTMP} else echo " " >> ${APPLICATIONTMP} fi else - for ARG in $PROC_ARGS; do - echo " " >> ${APPLICATIONTMP} - done + echo ${XML_ARGS} >> ${APPLICATIONTMP} fi echo " " >> ${APPLICATIONTMP} done @@ -464,7 +454,6 @@ cat >> ${APPLICATIONTMP} < APPLICATIONFOOT ##-------------------------------- end DEFAULT APPLICATION -------------------------------------- - ##---------------------- SMPI TRACING OPTIONS --------------------------------- if [ -n "${TRACE_ACTIVE}" ]; then #define trace filename @@ -485,7 +474,7 @@ if [ -n "${TRACE_ACTIVE}" ]; then fi if [ -n "${TRACE_COMMENT_FILE}" ]; then - TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/comment_file:${TRACE_COMMENT_FILE}" + TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/comment-file:${TRACE_COMMENT_FILE}" fi if [ -n "${TRACE_GROUPED}" ]; then @@ -504,7 +493,7 @@ fi export SMPI_GLOBAL_SIZE=${NUMPROCS} if [ -n "${KEEP}" ] ; then - echo ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} + echo ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PRIVATIZE} ${PLATFORMTMP} ${APPLICATIONTMP} if [ ${HOSTFILETMP} = 1 ] ; then echo "Generated hostfile ${HOSTFILE} kept." fi @@ -515,18 +504,14 @@ fi # Execute the process # -# The shell still need to be alive for the duration in order to do some cleanup -# after the process. +# The shell still need to be alive for the duration in order to do some cleanup after the process. # -# We are going through great lengths in order to both keep stdin and be able -# to handle signals: +# We are going through great lengths in order to both keep stdin and be able to handle signals: # -# * The job is launched in the background in order to be able to handle -# signals. +# * The job is launched in the background in order to be able to handle signals. # -# * The FD 3 is used to temporarily store FD 1. This is because the shell -# connects FD 1 to /dev/null when the command is launched in the -# background: this can be overriden in bash but not in standard bourne shell. +# * The FD 3 is used to temporarily store FD 1. This is because the shell connects FD 1 to /dev/null when the command +# is launched in the background: this can be overriden in bash but not in standard bourne shell. exec 3<&0 ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} <&3 3>&- & pid=$! @@ -535,6 +520,22 @@ wait $pid status=$? pid="" +# Keep temporary files on failures to help debugging +# +if [ ${status} -ne 0 ] ; then + if [ -z ${KEEP} ]; then + echo ${EXEC} ${TRACEOPTIONS} ${SIMOPTS} ${PRIVATIZE} ${PLATFORMTMP} ${APPLICATIONTMP} + if [ ${HOSTFILETMP} = 1 ] ; then + echo "Generated hostfile ${HOSTFILE} kept." + fi + if [ ${UNROLLEDHOSTFILETMP} = 1 ] ; then + echo "Generated unrolled hostfile ${UNROLLEDHOSTFILE} kept." + fi + fi + echo "Execution failed with code ${status}." + KEEP=true +fi + smpirun_cleanup exit $status