X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31995feaea3e1ba5e1d3398e0497b85749625739..e6e67305ecc66829721213aea23743f933b23b5d:/src/smpi/smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 0fda9b4c3f..6e5f71befa 100755
--- 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")
@@ -45,13 +50,13 @@ while true; do
     ;;
 
    "-map")
-	MAPOPT="on"
+	MAPOPT="true"
       shift 1
    ;;
 
-   "-quiet")
-	QUIET="true"
-      shift 1
+   "-trace")
+   	TRACEOPT="$2"
+   	  shift 2
    ;;
 
    "-keep-temps")
@@ -59,17 +64,20 @@ while true; do
       shift 1
    ;;
 
-   "-help" | "--help" | "-h") 
+   "-help" | "--help" | "-h")
       echo "usage:"
-      echo "$0 [-quiet] [-keep-temps] [-np <numprocs>] -platform <xmldesc> -hostfile <hostfile> [-map] 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="*)
-     SIMOPTS="$SIMOPTS $1"
+
+   "--cfg="*|"--log="*)
+     for OPT in ${1#*=}
+     do
+       SIMOPTS="$SIMOPTS ${1%%=*}=$OPT"
+     done
      shift 1
    ;;
     *)
@@ -87,13 +95,14 @@ shift
 
 
 ##-------------------------------- DEFAULT or SPECIFIED PLATFORM --------------------------------------
-if [ -z "${PLATFORM}" ]; then  
+if [ -z "${PLATFORM}" ]; then
 	PLATFORMTMP="$(mktemp tmpXXXXXX)"
 
 	cat > ${PLATFORMTMP} <<PLATFORMHEAD
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
+<AS id="AS0" routing="Full">
 PLATFORMHEAD
 
 for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
@@ -105,14 +114,15 @@ done
 for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
   for (( j=${NUMPROCS}; $j ; j=$j-1 )) do
     if [ $i -eq $j ]; then
-      echo "  <route src=\"host$i\" dst=\"host$j\"><link:ctn id=\"loop$i\"/></route>" >> ${PLATFORMTMP}
+      echo "  <route src=\"host$i\" dst=\"host$j\"><link_ctn id=\"loop$i\"/></route>" >> ${PLATFORMTMP}
     else
-      echo "  <route src=\"host$i\" dst=\"host$j\"><link:ctn id=\"link$i\"/><link:ctn id=\"link$j\"/></route>" >> ${PLATFORMTMP}
+      echo "  <route src=\"host$i\" dst=\"host$j\"><link_ctn id=\"link$i\"/><link_ctn id=\"link$j\"/></route>" >> ${PLATFORMTMP}
     fi
   done
 done
 
 cat >> ${PLATFORMTMP} <<PLATFORMFOOT
+</AS>
 </platform>
 PLATFORMFOOT
 
@@ -145,16 +155,28 @@ fi
 ##  hostfile has less than i lines.
 ##----------------------------------------------------------
 
+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 0 $((${NUMPROCS}-1))` 
+for i in ${SEQ}
 do
   if [ -n "${HOSTFILE}" ]; then
 	j=$(( $i % ${NUMHOSTS} ))
-  fi 
+  fi
   ##---- optional display of ranks to process mapping
-  if [ -n ${MAPOPT} ]; then
-	echo "[rank $i] -> ${hostnames[$j]}"  
+  if [ -n "${MAPOPT}" ]; then
+	echo "[rank $i] -> ${hostnames[$j]}"
   fi
 
   if [ -z "${hostnames[$j]}" ]; then
@@ -175,17 +197,23 @@ cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
 APPLICATIONFOOT
 ##-------------------------------- end DEFAULT APPLICATION --------------------------------------
 
-if [ -z "${QUIET}" ] ; then
-  echo ${EXEC} ${SIMOPTS} ${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 ---------------------------------
+
+export SMPI_GLOBAL_SIZE=${NUMPROCS}
+if [ -n "${KEEP}" ] ; then
+  echo ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
 fi
-${EXEC} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP}
+${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
 
-if [ "x$?" == "x0" ] && [ -n ${KEEP} ] ; then
-  if [ -z "${QUIET}" ] ; then
-    echo "[$0] cleaning up temp files" 
-  fi
+if [ -z "${KEEP}" ] ; then
    if [ -z "${PLATFORM}" ]; then
-	rm ${PLATFORMTMP} 
+	rm ${PLATFORMTMP}
    fi
    rm ${APPLICATIONTMP}
-fi
\ No newline at end of file
+fi