X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7da2926d0733ff0683f31aeea176ce71e127264f..14dbe48f4f9623cf72fc207b7c2041b9f611972a:/src/smpi/smpirun.in
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 1d80693ac1..895ed69e74 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -11,18 +11,18 @@
SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
SIMGRID_GITHASH="@SIMGRID_GITHASH@"
-DEFAULT_LOOPBACK_BANDWIDTH="498000000"
-DEFAULT_LOOPBACK_LATENCY="0.000004"
-DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))"
-DEFAULT_NETWORK_LATENCY="0.000005"
+DEFAULT_LOOPBACK_BANDWIDTH="498000000Bps"
+DEFAULT_LOOPBACK_LATENCY="0.000004s"
+DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))Bps"
+DEFAULT_NETWORK_LATENCY="0.000005s"
DEFAULT_NUMPROCS="4"
-DEFAULT_POWER="100"
+DEFAULT_SPEED="100flops"
LOOPBACK_BANDWIDTH="${DEFAULT_LOOPBACK_BANDWIDTH}"
LOOPBACK_LATENCY="${DEFAULT_LOOPBACK_LATENCY}"
NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}"
NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
-POWER="${DEFAULT_POWER}"
+SPEED="${DEFAULT_SPEED}"
SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304"
@@ -291,7 +291,7 @@ fi
if [ -z "${HOSTFILE}" ] ; then
HOSTFILETMP=1
- HOSTFILE="$(mktemp tmphostXXXXXX)"
+ HOSTFILE="$(mktemp smpitmp-hostfXXXXXX)"
perl -ne 'print "$1\n" if /.*.*/' ${PLATFORM} > ${HOSTFILE}
perl -ne 'if (/.* ${UNROLLEDHOSTFILE}
if [ ${HOSTFILETMP} = 1 ] ; then
rm ${HOSTFILE}
@@ -343,18 +343,18 @@ fi
##-------------------------------- DEFAULT or SPECIFIED PLATFORM --------------------------------------
if [ -z "${PLATFORM}" ]; then
- PLATFORMTMP="$(mktemp tmpXXXXXX)"
+ PLATFORMTMP="$(mktemp smpitmp-platfXXXXXX)"
cat > ${PLATFORMTMP} <
-
-
+
+
PLATFORMHEAD
i=${NUMPROCS}
while [ $i -gt 0 ]; do
- echo " " >> ${PLATFORMTMP}
+ echo " " >> ${PLATFORMTMP}
echo " " >> ${PLATFORMTMP}
echo " " >> ${PLATFORMTMP}
i=$((i - 1))
@@ -385,14 +385,14 @@ fi
##-------------------------------- end DEFAULT or SPECIFIED PLATFORM --------------------------------------
##-------------------------------- DEFAULT APPLICATION --------------------------------------
-APPLICATIONTMP="$(mktemp tmpXXXXXX)"
+APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)"
#APPLICATIONTMP="app.xml"
cat > ${APPLICATIONTMP} <
-
-
+
+
APPLICATIONHEAD
##---- cache hostnames of hostfile---------------
@@ -407,7 +407,7 @@ if [ "${EXTOPT}" = "smpi_replay" ]; then
hosttraces=$(cat ${APP_TRACES} | tr '\n\r' ' ' )
NUMTRACES=$(cat ${APP_TRACES} | wc -l)
else
- printf "File not found: %s\n", "${APP_TRACES:-\${APP_TRACES\}}" >&2
+ printf "File not found: %s\n" "${APP_TRACES:-\${APP_TRACES\}}" >&2
exit 1
fi
fi