MPI_Comm_split is back to life.

[simgrid.git] / src / smpi / smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index df12da4..66a3675 100755 (executable)
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+@CMAKE_SMPI_COMMAND@
+
 DEFAULT_LOOPBACK_BANDWIDTH="498000000"
 DEFAULT_LOOPBACK_LATENCY="0.000004"
 DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))"
@@ -13,6 +16,8 @@ NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
 NUMPROCS="${DEFAULT_NUMPROCS}"
 POWER="${DEFAULT_POWER}"
 
+SIMOPTS="--cfg=network/model:SMPI --cfg=TCP_gamma:4194304"
+
 while true; do
   case "$1" in
    "-np" | "-n")
@@ -29,19 +34,52 @@ while true; do
     ;;
    "-platform")
        PLATFORM="$2"
+      if [ ! -f ${PLATFORM} ]; then
+               echo "[$0] ** error: the file '${PLATFORM}' does not exist. Aborting."
+               exit 1
+      fi
        shift 2
     ;;
    "-hostfile")
        HOSTFILE="$2"
+      if [ ! -f ${HOSTFILE} ]; then
+               echo "[$0] ** error: the file '${HOSTFILE}' does not exist. Aborting."
+               exit 1
+      fi
        shift 2
     ;;
 
-   "-help" | "--help" | "-h") 
+   "-map")
+       MAPOPT="true"
+      shift 1
+   ;;
+
+   "-trace")
+       TRACEOPT="$2"
+         shift 2
+   ;;
+
+   "-keep-temps")
+       KEEP="true"
+      shift 1
+   ;;
+
+   "-help" | "--help" | "-h")
       echo "usage:"
-      echo "$0 [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] [-platform <xmldesc>] [-hostfile <hostfile>] program [program-options]"
+      echo "$0 [-quiet] [-keep-temps] [-trace <tracefile>] [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] program [program-options]"
+      echo "or (deprecated usage):"
+      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
       echo
       exit
    ;;
+
+   "--cfg="*|"--log="*)
+     for OPT in ${1#*=}
+     do
+       SIMOPTS="$SIMOPTS ${1%%=*}=$OPT"
+     done
+     shift 1
+   ;;
     *)
       break
     ;;
@@ -51,8 +89,13 @@ done
 EXEC="$1"
 shift
 
+##-----------------------------------
+
+
+
+
 ##-------------------------------- DEFAULT or SPECIFIED PLATFORM --------------------------------------
-if [ -z "${PLATFORM}" ]; then  
+if [ -z "${PLATFORM}" ]; then
        PLATFORMTMP="$(mktemp tmpXXXXXX)"
 
        cat > ${PLATFORMTMP} <<PLATFORMHEAD
@@ -100,6 +143,7 @@ APPLICATIONHEAD
 ##---- cache hostnames of hostfile---------------
 if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then
        hostnames=(`cat ${HOSTFILE} | tr \\\n " "`)
+      NUMHOSTS=`cat ${HOSTFILE} | wc -l`
 fi
 
 ##----------------------------------------------------------
@@ -108,40 +152,65 @@ fi
 ##  in hostfile (where -hostfile hostfile), or "host$i" if
 ##  hostfile has less than i lines.
 ##----------------------------------------------------------
-for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
-  j=$(( $i-1 ))
+
+HAVE_SEQ="`which seq 2>/dev/null`"
+
+if [ -n "${HAVE_SEQ}" ]; then
+       SEQ=`${HAVE_SEQ} 0 $((${NUMPROCS}-1))`
+else
+      cnt=0
+       while (( $cnt < ${NUMPROCS} )) ; do
+           SEQ="$SEQ $cnt"
+           cnt=$((cnt + 1));
+       done
+fi
+
+##---- generate <process> tags------------------------------
+
+for i in ${SEQ}
+do
+  if [ -n "${HOSTFILE}" ]; then
+       j=$(( $i % ${NUMHOSTS} ))
+  fi
+  ##---- optional display of ranks to process mapping
+  if [ -n "${MAPOPT}" ]; then
+       echo "[rank $i] -> ${hostnames[$j]}"
+  fi
+
   if [ -z "${hostnames[$j]}" ]; then
-       host="host"$i
+       host="host"$(($j+1))
   else
        host="${hostnames[$j]}"
   fi
   echo "  <process host=\"${host}\" function=\"smpi_simulated_main\">" >> ${APPLICATIONTMP}
-    echo "    <argument value=\"$j\"/> <!-- rank -->" >> ${APPLICATIONTMP}
+  echo "    <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
   for ARG in $*; do
     echo "    <argument value=\"${ARG}\"/>" >> ${APPLICATIONTMP}
   done
   echo "  </process>" >> ${APPLICATIONTMP}
 done
 
-for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
-  j=$(( $i-1 ))
-  if [ -z "${hostnames[$j]}" ]; then
-       host="host"$i
-  else
-       host="${hostnames[$j]}"
-  fi
-done
-
 cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
 </platform>
 APPLICATIONFOOT
 ##-------------------------------- end DEFAULT APPLICATION --------------------------------------
 
-echo ${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
-${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
+##---------------------- SMPI TRACING OPTIONS ---------------------------------
+  if [ -n "${TRACEOPT}" ]; then
+    TRACEOPTIONS="--cfg=tracing/filename:${TRACEOPT} --cfg=tracing/smpi:1 --cfg=tracing/platform:1"
+  else
+    TRACEOPTIONS=""
+  fi
+##---------------------- end SMPI TRACING OPTIONS ---------------------------------
 
-echo "[$0] cleaning up temp files"
-if [ -z "${PLATFORM}" ]; then
-       rm ${PLATFORMTMP} 
+if [ -n "${KEEP}" ] ; then
+  echo ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
+fi
+${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
+
+if [ -z "${KEEP}" ] ; then
+   if [ -z "${PLATFORM}" ]; then
+       rm ${PLATFORMTMP}
+   fi
+   rm ${APPLICATIONTMP}
 fi
-#rm ${APPLICATIONTMP}