Commit 1c645c00 authored by one's avatar one
Browse files

[rocHPL] Rename --port to --ssh-port, update run-all.sh

parent 7e8d5453
#!/bin/bash #!/bin/bash
./build/mpirun_rochpl -P 8 -Q 4 --it 6 -i HPL-32.dat ./build/mpirun_rochpl -P 8 -Q 4 --it 6 -i HPL-32.dat \
./build/mpirun_rochpl -P 8 -Q 2 --it 6 -i HPL-16.dat -H node01,node02,node03,node04 \
./build/mpirun_rochpl -P 4 -Q 2 --it 6 -i HPL-8.dat # N=512*498 --tcp-iface p14p2 \
--ssh-port 3333
./build/mpirun_rochpl -P 8 -Q 2 --it 6 -i HPL-16.dat \
-H node01,node02 \
--tcp-iface p14p2 \
--ssh-port 3333
./build/mpirun_rochpl -P 4 -Q 2 --it 6 -i HPL-8.dat
./build/mpirun_rochpl -P 4 -Q 1 --it 6 -i HPL-4.dat ./build/mpirun_rochpl -P 4 -Q 1 --it 6 -i HPL-4.dat
./build/mpirun_rochpl -P 2 -Q 1 --it 6 -i HPL-2.dat ./build/mpirun_rochpl -P 2 -Q 1 --it 6 -i HPL-2.dat
./build/mpirun_rochpl -P 1 -Q 1 --it 6 -i HPL-1.dat ./build/mpirun_rochpl -P 1 -Q 1 --it 6 -i HPL-1.dat
...@@ -31,9 +31,9 @@ function display_help() ...@@ -31,9 +31,9 @@ function display_help()
echo " [-i] Input file. When set, all other commnand " echo " [-i] Input file. When set, all other commnand "
echo " line parameters are ignored, and problem " echo " line parameters are ignored, and problem "
echo " parameters are read from input file. " echo " parameters are read from input file. "
echo " [-H|--hosts] Comma-separated list of nodes to run on. " echo " [-H|--hosts] Comma-separated list of nodes to run on."
echo " [--tcp-iface] TCP interface to use for communication. " echo " [--tcp-iface] TCP interface to use for communication. "
echo " [--port] SSH port to use for remote connections. " echo " [--ssh-port] SSH port to use for remote connections. "
echo " [-h|--help] prints this help message " echo " [-h|--help] prints this help message "
echo " [--version] Print rocHPL version number. " echo " [--version] Print rocHPL version number. "
} }
...@@ -140,7 +140,7 @@ total_cpu_cores=$(($num_cpu_cores*$num_cpu_sockets)) ...@@ -140,7 +140,7 @@ total_cpu_cores=$(($num_cpu_cores*$num_cpu_sockets))
# check if we have a modern version of getopt that can handle whitespace and long parameters # check if we have a modern version of getopt that can handle whitespace and long parameters
getopt -T getopt -T
if [[ $? -eq 4 ]]; then if [[ $? -eq 4 ]]; then
GETOPT_PARSE=$(getopt --name "${0}" --longoptions NB:,it:,help,version,devices:,hosts:,port:,tcp-iface:, --options hP:Q:p:q:N:i:f:H: -- "$@") GETOPT_PARSE=$(getopt --name "${0}" --longoptions NB:,it:,help,version,devices:,hosts:,ssh-port:,tcp-iface:, --options hP:Q:p:q:N:i:f:H: -- "$@")
else else
echo "Need a new version of getopt" echo "Need a new version of getopt"
exit 1 exit 1
...@@ -202,7 +202,7 @@ while true; do ...@@ -202,7 +202,7 @@ while true; do
--tcp-iface) --tcp-iface)
tcp_iface=${2} tcp_iface=${2}
shift 2 ;; shift 2 ;;
--port) --ssh-port)
ssh_port=${2} ssh_port=${2}
shift 2 ;; shift 2 ;;
--) shift ; break ;; --) shift ; break ;;
......
diff --git a/scripts/mpirun_rochpl.in b/scripts/mpirun_rochpl.in diff --git a/scripts/mpirun_rochpl.in b/scripts/mpirun_rochpl.in
index 155f502..0f15d38 100755 index 155f502..aaab1f2 100755
--- a/scripts/mpirun_rochpl.in --- a/scripts/mpirun_rochpl.in
+++ b/scripts/mpirun_rochpl.in +++ b/scripts/mpirun_rochpl.in
@@ -31,6 +31,9 @@ function display_help() @@ -31,6 +31,9 @@ function display_help()
echo " [-i] Input file. When set, all other commnand " echo " [-i] Input file. When set, all other commnand "
echo " line parameters are ignored, and problem " echo " line parameters are ignored, and problem "
echo " parameters are read from input file. " echo " parameters are read from input file. "
+ echo " [-H|--hosts] Comma-separated list of nodes to run on. " + echo " [-H|--hosts] Comma-separated list of nodes to run on."
+ echo " [--tcp-iface] TCP interface to use for communication. " + echo " [--tcp-iface] TCP interface to use for communication. "
+ echo " [--port] SSH port to use for remote connections. " + echo " [--ssh-port] SSH port to use for remote connections. "
echo " [-h|--help] prints this help message " echo " [-h|--help] prints this help message "
echo " [--version] Print rocHPL version number. " echo " [--version] Print rocHPL version number. "
} }
...@@ -82,7 +82,7 @@ index 155f502..0f15d38 100755 ...@@ -82,7 +82,7 @@ index 155f502..0f15d38 100755
getopt -T getopt -T
if [[ $? -eq 4 ]]; then if [[ $? -eq 4 ]]; then
- GETOPT_PARSE=$(getopt --name "${0}" --longoptions NB:,it:,help,version,devices:, --options hP:Q:p:q:N:i:f: -- "$@") - GETOPT_PARSE=$(getopt --name "${0}" --longoptions NB:,it:,help,version,devices:, --options hP:Q:p:q:N:i:f: -- "$@")
+ GETOPT_PARSE=$(getopt --name "${0}" --longoptions NB:,it:,help,version,devices:,hosts:,port:,tcp-iface:, --options hP:Q:p:q:N:i:f:H: -- "$@") + GETOPT_PARSE=$(getopt --name "${0}" --longoptions NB:,it:,help,version,devices:,hosts:,ssh-port:,tcp-iface:, --options hP:Q:p:q:N:i:f:H: -- "$@")
else else
echo "Need a new version of getopt" echo "Need a new version of getopt"
exit 1 exit 1
...@@ -105,7 +105,7 @@ index 155f502..0f15d38 100755 ...@@ -105,7 +105,7 @@ index 155f502..0f15d38 100755
+ --tcp-iface) + --tcp-iface)
+ tcp_iface=${2} + tcp_iface=${2}
+ shift 2 ;; + shift 2 ;;
+ --port) + --ssh-port)
+ ssh_port=${2} + ssh_port=${2}
+ shift 2 ;; + shift 2 ;;
--) shift ; break ;; --) shift ; break ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment