X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ed181c23cb36f8fff699f9cffefce42247a40b3..dbe918800fbc9d06617113c8a71b363e09bbbf20:/src/smpi/smpirun.in

diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index bcd1e936fa..1770c4b4db 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))"
@@ -10,9 +13,36 @@ 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"
+
+#usage to print the way this script should be called
+function usage () {
+    echo "usage:"
+    echo "$0 [-keep-temps]"
+    echo "      [-np <numprocs>] -platform <xmldesc> -hostfile <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 <numprocs>]          # 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 <tracefile>] # name of the tracefile (simgrid_smpi.trace)"
+    echo "or (deprecated usage):"
+    echo "$0 [-keep-temps] [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] program [program-options]"
+    echo
+}
+
+#check if we have at least one parameter
+if [ $# -eq 0 ]
+then
+    usage
+    exit
+fi
+
 while true; do
   case "$1" in
    "-np" | "-n")
@@ -29,19 +59,68 @@ 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") 
-      echo "usage:"
-      echo "$0 [-np <numprocs>] [-bandwidth <bytes/sec>] [-latency <secs>] [-platform <xmldesc>] [-hostfile <hostfile>] program [program-options]"
-      echo
+   "-map")
+	MAPOPT="true"
+      shift 1
+   ;;
+
+   "-trace")
+   	TRACE_ACTIVE="true"
+   	  shift 1
+   ;;
+
+   "-trace-file")
+      TRACE_FILENAME="$2"
+      shift 2
+   ;;
+
+   "-trace-grouped")
+      TRACE_GROUPED="true"
+      shift 1
+   ;;
+
+   "-trace-resource")
+      TRACE_RESOURCE="true"
+      shift 1
+   ;;
+
+   "-trace-triva")
+   	TRACE_TRIVA="true"
+   	  shift 1
+   ;;
+
+   "-keep-temps")
+	KEEP="true"
+      shift 1
+   ;;
+
+   "-help" | "--help" | "-h")
+      usage
       exit
    ;;
+
+   "--cfg="*|"--log="*)
+     for OPT in ${1#*=}
+     do
+       SIMOPTS="$SIMOPTS ${1%%=*}=$OPT"
+     done
+     shift 1
+   ;;
     *)
       break
     ;;
@@ -51,15 +130,43 @@ done
 EXEC="$1"
 shift
 
+##-----------------------------------
+
+# 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  
+if [ -z "${PLATFORM}" ]; then
 	PLATFORMTMP="$(mktemp tmpXXXXXX)"
-	#PLATFORMTMP="pla.xml"
 
 	cat > ${PLATFORMTMP} <<PLATFORMHEAD
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+<AS id="AS0" routing="Full">
 PLATFORMHEAD
 
 for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
@@ -71,14 +178,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
 
@@ -94,13 +202,14 @@ APPLICATIONTMP="$(mktemp tmpXXXXXX)"
 
 cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
 APPLICATIONHEAD
 
 ##---- cache hostnames of hostfile---------------
 if [ -n "${HOSTFILE}" ] && [ -f ${HOSTFILE} ]; then
 	hostnames=(`cat ${HOSTFILE} | tr \\\n " "`)
+      NUMHOSTS=`cat ${HOSTFILE} | wc -l`
 fi
 
 ##----------------------------------------------------------
@@ -109,41 +218,83 @@ 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 "  <process host=\"${host}\" function=\"rank$i\"> <!-- function name used only for logging -->" >> ${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
- 
-  echo "  <process host=\"${host}\" function=\"smpi_sender\"/>" >> ${APPLICATIONTMP}
-  echo "  <process host=\"${host}\" function=\"smpi_receiver\"/>" >> ${APPLICATIONTMP}
-done
-
 cat >> ${APPLICATIONTMP} <<APPLICATIONFOOT
 </platform>
 APPLICATIONFOOT
 ##-------------------------------- end DEFAULT APPLICATION --------------------------------------
 
-${EXEC} ${PLATFORMTMP} ${APPLICATIONTMP}
+##---------------------- SMPI TRACING OPTIONS ---------------------------------
+if [ -n "${TRACE_ACTIVE}" ]; then
+  #define trace filename
+  if [ -z "${TRACE_FILENAME}" ]; then
+    TRACE_FILENAME="smpi_simgrid.trace"
+  fi
+  TRACEOPTIONS="--cfg=tracing:1 --cfg=tracing/filename:${TRACE_FILENAME} --cfg=tracing/smpi:1"
 
-echo "[$0] cleaning up temp files"
-if [ -z "${PLATFORM}" ]; then
-	rm ${PLATFORMTMP} 
+  if [ -n "${TRACE_GROUPED}" ]; then
+    TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/smpi/group:1"
+  fi
+
+  if [ -n "${TRACE_RESOURCE}" ]; then
+    TRACEOPTIONS="${TRACEOPTIONS} --cfg=tracing/categorized:1 --cfg=tracing/uncategorized:1"
+  fi
+
+  if [ -n "${TRACE_TRIVA}" ]; then
+    TRACEOPTIONS="${TRACEOPTIONS} --cfg=triva/categorized:smpi_cat.plist --cfg=triva/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}
+fi
+${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
+status=$?
+
+if [ -z "${KEEP}" ] ; then
+   if [ -z "${PLATFORM}" ]; then
+	rm ${PLATFORMTMP}
+   fi
+   rm ${APPLICATIONTMP}
 fi
-rm ${APPLICATIONTMP}
+
+exit $status