A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add xbt_lib_size and xbt_lib_rehash
[simgrid.git]
/
src
/
smpi
/
smpirun.in
diff --git
a/src/smpi/smpirun.in
b/src/smpi/smpirun.in
index
6762c62
..
09ea663
100755
(executable)
--- a/
src/smpi/smpirun.in
+++ b/
src/smpi/smpirun.in
@@
-16,7
+16,7
@@
NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
NUMPROCS="${DEFAULT_NUMPROCS}"
POWER="${DEFAULT_POWER}"
NUMPROCS="${DEFAULT_NUMPROCS}"
POWER="${DEFAULT_POWER}"
-SIMOPTS="--cfg=network/model:SMPI --cfg=TCP_gamma:4194304"
+SIMOPTS="--cfg=
maxmin/precision:1e-9 --cfg=
network/model:SMPI --cfg=TCP_gamma:4194304"
while true; do
case "$1" in
while true; do
case "$1" in
@@
-59,6
+59,11
@@
while true; do
shift 2
;;
shift 2
;;
+ "-triva")
+ TRIVA="true"
+ shift 1
+ ;;
+
"-keep-temps")
KEEP="true"
shift 1
"-keep-temps")
KEEP="true"
shift 1
@@
-100,8
+105,9
@@
if [ -z "${PLATFORM}" ]; then
cat > ${PLATFORMTMP} <<PLATFORMHEAD
<?xml version='1.0'?>
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
PLATFORMHEAD
for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
@@
-113,14
+119,15
@@
done
for (( i=${NUMPROCS}; $i ; i=$i-1 )) do
for (( j=${NUMPROCS}; $j ; j=$j-1 )) do
if [ $i -eq $j ]; then
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
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
fi
done
done
cat >> ${PLATFORMTMP} <<PLATFORMFOOT
+</AS>
</platform>
PLATFORMFOOT
</platform>
PLATFORMFOOT
@@
-136,8
+143,8
@@
APPLICATIONTMP="$(mktemp tmpXXXXXX)"
cat > ${APPLICATIONTMP} <<APPLICATIONHEAD
<?xml version='1.0'?>
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---------------
APPLICATIONHEAD
##---- cache hostnames of hostfile---------------
@@
-197,16
+204,23
@@
APPLICATIONFOOT
##---------------------- SMPI TRACING OPTIONS ---------------------------------
if [ -n "${TRACEOPT}" ]; then
##---------------------- SMPI TRACING OPTIONS ---------------------------------
if [ -n "${TRACEOPT}" ]; then
- TRACEOPTIONS="--cfg=tracing
/filename:${TRACEOPT} --cfg=tracing/smpi
:1"
+ TRACEOPTIONS="--cfg=tracing
:1 --cfg=tracing/filename:${TRACEOPT} --cfg=tracing/smpi:1 --cfg=tracing/categorized:1 --cfg=tracing/uncategorized
:1"
else
TRACEOPTIONS=""
fi
else
TRACEOPTIONS=""
fi
+
+ if [ -n "${TRIVA}" ]; then
+ TRIVAOPTIONS="--cfg=triva/categorized:smpi_cat.plist --cfg=triva/uncategorized:smpi_uncat.plist"
+ else
+ TRIVAOPTIONS=""
+ fi
##---------------------- end SMPI TRACING OPTIONS ---------------------------------
##---------------------- end SMPI TRACING OPTIONS ---------------------------------
+export SMPI_GLOBAL_SIZE=${NUMPROCS}
if [ -n "${KEEP}" ] ; then
if [ -n "${KEEP}" ] ; then
- echo ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
+ echo ${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${
TRIVAOPTIONS} ${
PLATFORMTMP} ${APPLICATIONTMP}
fi
fi
-${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${PLATFORMTMP} ${APPLICATIONTMP}
+${EXEC} ${SIMOPTS} ${TRACEOPTIONS} ${
TRIVAOPTIONS} ${
PLATFORMTMP} ${APPLICATIONTMP}
if [ -z "${KEEP}" ] ; then
if [ -z "${PLATFORM}" ]; then
if [ -z "${KEEP}" ] ; then
if [ -z "${PLATFORM}" ]; then