Skip to content

Commit

Permalink
fabtests: change xfer-method variable to xfer_method in runmultinode.sh
Browse files Browse the repository at this point in the history
The '-' in the xfer-method option in the runmultinode.sh script causes
method and xfer as separate instead of a single bash variable xfer-method.
This supplies invalid inputs to the fi_multinode test. changing the bash variable xfer-method
to xfer_method fixes this issue.

Signed-off-by: Nikhil Nanal <[email protected]>
  • Loading branch information
nikhilnanal authored and j-xiong committed Oct 24, 2024
1 parent b534edc commit f68230e
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions fabtests/scripts/runmultinode.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

Options=$(getopt --options h:,n:,p:,I:,-x:,z: \
--longoptions hosts:,processes-per-node:,provider:,xfer-method:,iterations:,ci:,cleanup,help \
--longoptions hosts:,processes-per-node:,provider:,xfer-method:,iterations:,ci:,cleanup,help \
-- "$@")

eval set -- "$Options"
Expand All @@ -10,7 +10,7 @@ hosts=[]
ppn=1
iterations=1
pattern=""
xfer-method="msg"
xfer_method="msg"
cleanup=false
help=false
ci=""
Expand All @@ -19,7 +19,7 @@ while true; do
case "$1" in
-h|--hosts)
IFS=',' read -r -a hosts <<< "$2"; shift 2 ;;
-n|--processes-per-node)
-n|--processes-per-node)
ppn=$2; shift 2 ;;
-p|--provider)
provider="$2"; shift 2 ;;
Expand All @@ -30,32 +30,32 @@ while true; do
--cleanup)
cleanup=true; shift ;;
-x|--xfer-method)
xfer-method="$2"; shift 2 ;;
xfer_method="$2"; shift 2 ;;
--ci)
ci="$2"; shift 2 ;;
--help)
--help)
help=true; shift ;;
--)
shift; break ;;
esac
done

if $help ; then
echo "Run the multinode test suite on the nodes provided for many procceses"
echo "Run the multinode test suite on the nodes provided for many procceses"
echo "multinode tests are run in performance mode"
echo "Options"
echo "\t-h,--hosts list of host names to run the tests on"
echo "\t-n,--processes-per-node number of processes to be run on each node.\
Total number of fi_mulinode tests run will be n*number of hosts"
echo "\t-p,--provider libfabric provider to run the multinode tests on"
echo "\t-C,--cabability multinode cabability to use (rma or default: msg)"
echo "\t-x,--xfer-method multinode transfer method/capability to use (rma or default: msg)"
echo "\t-I,-- iterations number of iterations for the multinode test \
to run each pattern on"
echo "\t--cleanup end straggling processes. Does not rerun tests"
echo "\t--help show this message"
exit 1
fi

num_hosts=${#hosts[@]}
max_ranks=$(($num_hosts*$ppn))
ranks=$max_ranks;
Expand All @@ -65,15 +65,15 @@ output="multinode_server_${num_hosts}_${ppn}.log"
ret=0

if ! $cleanup ; then
cmd="${ci}fi_multinode -n $ranks -s $server -p '$provider' -x $xfer-method $pattern -I $iterations -T"
cmd="${ci}fi_multinode -n $ranks -s $server -p '$provider' -x $xfer_method $pattern -I $iterations -T"
echo $cmd
for node in "${hosts[@]}"; do
for i in $(seq 1 $ppn); do
if [ $start_server -eq 0 ]; then
echo STARTING SERVER
if [ "$ci" == "" ]; then
ssh $node $cmd &> $output &
else
else
ssh $node $cmd | tee $output &
fi
server_pid=$!
Expand Down Expand Up @@ -104,4 +104,4 @@ if ! $cleanup ; then
echo "Output: $PWD/$output"
fi

exit $ret
exit $ret

0 comments on commit f68230e

Please sign in to comment.