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
some algos have bad behavior with some inputs, try to avoid that.
[simgrid.git]
/
src
/
smpi
/
smpirun.in
diff --git
a/src/smpi/smpirun.in
b/src/smpi/smpirun.in
index
2cd37fc
..
5b588bf
100755
(executable)
--- a/
src/smpi/smpirun.in
+++ b/
src/smpi/smpirun.in
@@
-8,6
+8,8
@@
@CMAKE_SMPI_COMMAND@
@CMAKE_SMPI_COMMAND@
+SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
+
DEFAULT_LOOPBACK_BANDWIDTH="498000000"
DEFAULT_LOOPBACK_LATENCY="0.000004"
DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))"
DEFAULT_LOOPBACK_BANDWIDTH="498000000"
DEFAULT_LOOPBACK_LATENCY="0.000004"
DEFAULT_NETWORK_BANDWIDTH="$((26 * 1024 * 1024))"
@@
-21,7
+23,7
@@
NETWORK_BANDWIDTH="${DEFAULT_NETWORK_BANDWIDTH}"
NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
POWER="${DEFAULT_POWER}"
NETWORK_LATENCY="${DEFAULT_NETWORK_LATENCY}"
POWER="${DEFAULT_POWER}"
-SIMOPTS="--cfg=
maxmin/precision:1e-3 --cfg=
surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304"
+SIMOPTS="--cfg=surf/precision:1e-9 --cfg=network/model:SMPI --cfg=network/TCP_gamma:4194304"
#usage to print the way this script should be called
usage () {
#usage to print the way this script should be called
usage () {
@@
-77,7
+79,7
@@
while true; do
"-platform")
PLATFORM="$2"
if [ ! -f "${PLATFORM}" ]; then
"-platform")
PLATFORM="$2"
if [ ! -f "${PLATFORM}" ]; then
- echo "[
$0
] ** error: the file '${PLATFORM}' does not exist. Aborting."
+ echo "[
`basename $0`
] ** error: the file '${PLATFORM}' does not exist. Aborting."
exit 1
fi
shift 2
exit 1
fi
shift 2
@@
-85,7
+87,7
@@
while true; do
"-hostfile")
HOSTFILE="$2"
if [ ! -f "${HOSTFILE}" ]; then
"-hostfile")
HOSTFILE="$2"
if [ ! -f "${HOSTFILE}" ]; then
- echo "[
$0
] ** error: the file '${HOSTFILE}' does not exist. Aborting."
+ echo "[
`basename $0`
] ** error: the file '${HOSTFILE}' does not exist. Aborting."
exit 1
fi
shift 2
exit 1
fi
shift 2
@@
-94,7
+96,7
@@
while true; do
"-machinefile")
HOSTFILE="$2"
if [ ! -f "${HOSTFILE}" ]; then
"-machinefile")
HOSTFILE="$2"
if [ ! -f "${HOSTFILE}" ]; then
- echo "[
$0
] ** error: the file '${HOSTFILE}' does not exist. Aborting."
+ echo "[
`basename $0`
] ** error: the file '${HOSTFILE}' does not exist. Aborting."
exit 1
fi
shift 2
exit 1
fi
shift 2
@@
-163,7
+165,12
@@
while true; do
"-help" | "--help" | "-h")
usage
"-help" | "--help" | "-h")
usage
- exit
+ exit 0
+ ;;
+
+ "-version" | "--version" | "-v")
+ printf '%b\n' "$SIMGRID_VERSION"
+ exit 0
;;
"--cfg="*|"--log="*)
;;
"--cfg="*|"--log="*)
@@
-237,6
+244,10
@@
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`
# 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 [ ${hostfile_procs} = 0 ] ; then
+ echo "[`basename $0`] ** error: the hostfile '${HOSTFILE}' is empty. Aborting." >&2
+ exit 1
+fi
if [ -z "${NUMPROCS}" ] ; then
# Use the amount of processes in the hostfile as default value for the -np parameter
if [ -z "${NUMPROCS}" ] ; then
# Use the amount of processes in the hostfile as default value for the -np parameter