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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
smpirun.in
diff --git
a/src/smpi/smpirun.in
b/src/smpi/smpirun.in
index
9dfb521
..
5b588bf
100755
(executable)
--- a/
src/smpi/smpirun.in
+++ b/
src/smpi/smpirun.in
@@
-23,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 () {
@@
-79,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
@@
-87,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
@@
-96,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
@@
-244,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
@@
-350,11
+354,7
@@
fi
for i in ${SEQ}
do
if [ -n "${HOSTFILE}" ]; then
for i in ${SEQ}
do
if [ -n "${HOSTFILE}" ]; then
- if [ ${NUMHOSTS} = 0 ] ; then
- j= 0
- else
- j=$(( $i % ${NUMHOSTS} + 1 ))
- fi
+ j=$(( $i % ${NUMHOSTS} + 1 ))
fi
##---- optional display of ranks to process mapping
if [ -n "${MAPOPT}" ]; then
fi
##---- optional display of ranks to process mapping
if [ -n "${MAPOPT}" ]; then