Changeset 2295
- Timestamp:
- Jun 27, 2017 2:25:52 PM (7 years ago)
- Location:
- palm/trunk/SCRIPTS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mrun
r2290 r2295 27 27 # ----------------- 28 28 # $Id$ 29 # adjustments for using lcgeohu (cirrus @ HUB) 30 # cpp_opts removed 31 # 32 # 2290 2017-06-19 11:03:06Z raasch 29 33 # further test output removed 30 34 # … … 278 282 coupled_dist="" 279 283 coupled_mode="mpi1" 280 cpp_opts=""281 284 cpp_options="" 282 285 cpumax=0 … … 465 468 # READ SHELLSCRIPT-OPTIONS AND REBUILD THE MRUN-COMMAND STRING (MC), 466 469 # WHICH WILL BE USED TO START RESTART-JOBS 467 while getopts :a:bBc:Cd: D:Fg:G:h:H:i:kK:m:M:n:o:O:p:P:q:r:R:s:St:T:u:U:vw:xX:yY:zZ option470 while getopts :a:bBc:Cd:Fg:G:h:H:i:kK:m:M:n:o:O:p:P:q:r:R:s:St:T:u:U:vw:xX:yY:zZ option 468 471 do 469 472 case $option in … … 522 525 then 523 526 (printf "\n *** mrun can be called as follows:\n" 524 printf "\n $mrun_script_name -b -c.. -d.. - D.. -f.. -F -h.. -i.. -I -K.. -m.. -o.. -p.. -r.. -R -s.. -t.. -T.. -v -x -X.. -y -Y.. -Z <modus> \n"527 printf "\n $mrun_script_name -b -c.. -d.. -f.. -F -h.. -i.. -I -K.. -m.. -o.. -p.. -r.. -R -s.. -t.. -T.. -v -x -X.. -y -Y.. -Z <modus> \n" 525 528 printf "\n Description of available options:\n" 526 529 printf "\n Option Description Default-Value" … … 530 533 printf "\n -c configuration file .mrun.config" 531 534 printf "\n -d base name of files attached to program test" 532 printf "\n -D preprocessor(cpp)-directives \"\" "533 535 printf "\n -F create remote job file only ---" 534 536 printf "\n -h execution host $localhost_realname" … … 657 659 do_remote=true 658 660 case $host in 659 (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb ) true;;661 (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb|lcgeohu) true;; 660 662 (*) printf "\n" 661 663 printf "\n +++ sorry: execution of batch jobs on remote host \"$host\"" … … 800 802 do_remote=true 801 803 case $host in 802 (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb ) true;;804 (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb|lcgeohu) true;; 803 805 (*) printf "\n +++ sorry: execution of batch jobs on remote host \"$host\"" 804 806 printf "\n is not available" … … 1064 1066 do_remote=true 1065 1067 case $host in 1066 (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb ) true;;1068 (ibm|ibmh|ibmkisti|ibmku|ibms|lcbullhh|lccrayb|lccrayh|lccrayf|lceddy|lckyoto|lcocean|unics|lcxe6|lcxt5m|lck|lckiaps|lckordi|lckyuh|lckyut|lcsb|lcgeohu) true;; 1067 1069 (*) printf "\n" 1068 1070 printf "\n +++ sorry: execution of batch jobs on remote host \"$host\"" … … 1202 1204 (lccrayb) queue=mpp1q;; 1203 1205 (lccrayh) queue=mpp1q;; 1206 (lcgeohu) queue=short;; 1204 1207 (lckiaps) queue=normal;; 1205 1208 (lckyoto) queue=ph;; … … 1816 1819 fi 1817 1820 1818 # SET DIRECTIVES GIVEN BY OPTION -D1819 if [[ -n $cpp_opts ]]1820 then1821 for popts in $cpp_opts1822 do1823 if [[ $(echo $localhost | cut -c1-3) = ibm ]]1824 then1825 cpp_options="${cpp_options},-D__$popts=__$popts"1826 else1827 cpp_options="$cpp_options -D__$popts"1828 fi1829 done1830 fi1831 1832 1821 else 1833 1822 … … 2390 2379 then 2391 2380 make $mopts -f Makefile PROG=a.out F90=$compiler_name COPT="$cpp_options" F90FLAGS="$fopts" LDFLAGS="$lopts" 2392 2393 then 2394 2381 elif [[ $localhost = lceddy ]] 2382 then 2383 which mpifc 2395 2384 make $mopts -f Makefile PROG=a.out F90=$compiler_name COPT="$cpp_options" F90FLAGS="$fopts" LDFLAGS="$lopts" 2385 elif [[ $localhost = lcgeohu ]] 2386 then 2387 printf " compiler is called via ssh on \"cirrus\" \n" 2388 ssh $SSH_PORTOPT cirrus.geo.hu-berlin.de -l $usern "$init_cmds $module_calls cd $TEMPDIR; make $mopts -f Makefile PROG=a.out F90=$compiler_name COPT=\"$cpp_options\" F90FLAGS=\"$fopts\" LDFLAGS=\"$lopts\" " 2389 # this check did not work. Although a.out exists, it sets compile_error to true! 2390 # [[ ! -f a.out ]] && compile_error=true 2391 continue # STATUS=1, IF a.out EXISTS 2396 2392 else 2397 2393 [[ "$init_cmds" != "" ]] && eval $init_cmds … … 2948 2944 then 2949 2945 echo $ii 2950 2951 2946 echo $tasks_per_node 2947 echo $nodes 2952 2948 mpirun -n $ii a.out < runfile_atmos 2949 elif [[ $host = lcgeohu ]] 2950 then 2951 srun -n $ii a.out < runfile_atmos 2953 2952 elif [[ $host = lcocean ]] 2954 2953 then … … 3533 3532 then 3534 3533 3535 if [[ $localhost = lcbullhh || $localhost = lccrayb || $localhost = lccrayh || $localhost = ibmh || $localhost = ibmkisti || $localhost = ibmku || $localhost = ibms || $localhost = lceddy || $localhost = lckyu* || $localhost = lcxe6 ]]3534 if [[ $localhost = lcbullhh || $localhost = lccrayb || $localhost = lccrayh || $localhost = ibmh || $localhost = ibmkisti || $localhost = ibmku || $localhost = ibms || $localhost = lceddy || $localhost = lckyu* || $localhost = lcxe6 || $localhost = lcgeohu ]] 3536 3535 then 3537 3536 echo "*** ssh will be used to initiate restart-runs!" … … 3574 3573 then 3575 3574 ssh $usern@hlogin1 "ssh $SSH_PORTOPT $return_address -l $return_username \"PATH=\\\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc\" " 3575 elif [[ $localhost = lccgeohu ]] 3576 then 3577 ssh $usern@cirrus.geo.hu-berlin.de "ssh $SSH_PORTOPT $return_address -l $return_username \"PATH=\\\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc\" " 3576 3578 else 3577 3579 ssh $SSH_PORTOPT $return_address -l $return_username "PATH=\$PATH:$LOCAL_MRUN_PATH;export PALM_BIN=$LOCAL_MRUN_PATH;cd $LOCAL_PWD; $mc " … … 3666 3668 # BUILD THE MRUN-COMMAND TO BE CALLED IN THE BATCH-JOB ON THE REMOTE-MACHINE 3667 3669 mrun_com="$mrun_script_name -a $afname -c $config_file -d $fname -h $host -H $fromhost -m $memory -t $cpumax -q $queue -R $return_address -U $return_username -u $remote_username" 3668 [[ "$cpp_opts" != "" ]] && mrun_com=${mrun_com}" -D \"$cpp_opts\""3669 3670 [[ "$global_revision" != "" ]] && mrun_com=${mrun_com}" -G \"$global_revision\"" 3670 3671 [[ $group_number != none ]] && mrun_com=${mrun_com}" -g $group_number" … … 3772 3773 # THIS MAY CREATE A QUITE LARGE JOB-FILE, WHICH CAN CAUSE PROBLEMS WITH SOME 3773 3774 # QUEUEING-SYSTEMS 3774 if [[ $host = ibmkisti || $host = lcbullhh || $host = lccrayb || $host = lccrayf || $host = lccrayh || $host = lcocean ]]3775 if [[ $host = ibmkisti || $host = lcbullhh || $host = lccrayb || $host = lccrayf || $host = lccrayh || $host = lcocean || $host = lcgeohu ]] 3775 3776 then 3776 3777 -
palm/trunk/SCRIPTS/subjob
r2266 r2295 28 28 # ----------------- 29 29 # $Id$ 30 # adjustments for using lcgeohu (cirrus @ HUB) 31 # 32 # 2266 2017-06-09 09:27:21Z raasch 30 33 # nech related parts removed 31 34 # … … 279 282 (vorias) local_address=172.20.25.43; local_host=lcmuk;; 280 283 (*.cc.kyushu-u.ac.jp) local_address=133.5.4.129; local_host=ibmku;; 284 (*.cluster) local_address=192.168.1.254; local_host=lcgeohu;; 281 285 (*) printf "\n +++ \"$local_host\" unknown"; 282 286 printf "\n please contact the PALM group at IMUK"; … … 410 414 (lccrayf) queue=small; remote_address=86.50.166.21; submcom=/opt/slurm/default/bin/sbatch;; 411 415 (lceddy) remote_address=eddy.hpc.uni-oldenburg.de; submcom=sbatch;; 416 (lcgeohu) remote_address=cirrus.geo.hu-berlin.de; submcom=sbatch;; 412 417 (lckyoto) remote_address=133.3.51.11; submcom=/thin/local/bin/qsub;; 413 418 (lck) remote_address=165.132.26.61; submcom=/usr/torque/bin/qsub;; … … 964 969 fi 965 970 971 elif [[ $remote_host = lcgeohu ]] 972 then 973 974 if [[ $email_notification = none ]] 975 then 976 notify_user="" 977 else 978 notify_user="#SBATCH --mail-type=ALL" 979 fi 980 981 if [[ $numprocs != 0 ]] 982 then 983 cat > $job_to_send << %%END%% 984 #!/bin/bash 985 #SBATCH --job-name=$job_name 986 #SBATCH --ntasks=$processes_per_node 987 #SBATCH --time=$timestring 988 #SBATCH --output=$remote_dayfile 989 #SBATCH --error=$remote_dayfile 990 #SBATCH --qos=short 991 $notify_user 992 993 $init_cmds 994 $module_calls 995 996 %%END%% 997 998 else 999 cat > $job_to_send << %%END%% 1000 #!/bin/bash 1001 #SBATCH --job-name=$job_name 1002 #SBATCH --ntasks=$processes_per_node 1003 #SBATCH --output=$remote_dayfile 1004 #SBATCH --error=$remote_dayfile 1005 #SBATCH -l ncpus=1 1006 1007 $init_cmds 1008 $module_calls 1009 1010 %%END%% 1011 1012 fi 1013 966 1014 elif [[ $remote_host = lckiaps ]] 967 1015 then … … 1223 1271 echo "trap '" >> $job_to_send 1224 1272 echo "set +vx" >> $job_to_send 1225 if [[ $(echo $remote_host | cut -c1-3) = ibm || $remote_host = lcbullhh || $remote_host = lccrayb || $remote_host = lccrayh || $(echo $remote_host | cut -c1-3) = nec || $remote_host = lckiaps || $remote_host = lckyu* || $remote_host = lcxe6 || $remote_host = lcocean ]]1273 if [[ $(echo $remote_host | cut -c1-3) = ibm || $remote_host = lcbullhh || $remote_host = lccrayb || $remote_host = lccrayh || $(echo $remote_host | cut -c1-3) = nec || $remote_host = lckiaps || $remote_host = lckyu* || $remote_host = lcxe6 || $remote_host = lcocean || $remote_host = lcgeohu ]] 1226 1274 then 1227 1275 if [[ $remote_host = ibmh ]] … … 1398 1446 echo "[[ \"\$for_subjob_to_do\" != \"\" ]] && eval \$for_subjob_to_do" >> $job_to_send 1399 1447 echo "%%END%%" >> $job_to_send 1448 1449 elif [[ $remote_host = lcgeohu ]] 1450 then 1451 echo "cat > scpjob.$identifier << %%END%%" >> $job_to_send 1452 echo "#!/bin/bash" >> $job_to_send 1453 echo "#SBATCH --job-name=job_protocol_transfer" >> $job_to_send 1454 echo "#SBATCH -t 00:20:00" >> $job_to_send 1455 echo "#SBATCH -N 1" >> $job_to_send 1456 echo "#SBATCH -n 1" >> $job_to_send 1457 echo "#SBATCH -o \$HOME/job_queue/last_job_transfer_protocol" >> $job_to_send 1458 echo "#SBATCH -o $remote_dayfile" >> $job_to_send 1459 echo "#SBATCH -e $remote_dayfile" >> $job_to_send 1460 echo " " >> $job_to_send 1461 echo "set -x" >> $job_to_send 1462 echo "sbatch scpjob.$identifier" >> $job_to_send 1463 echo "%%END%%" >> $job_to_send 1464 1400 1465 else 1401 1466 … … 1497 1562 job_catalog_save=$job_catalog 1498 1563 job_catalog=job_queue 1564 elif [[ $remote_host = lcgeohu ]] 1565 then 1566 job_catalog_save=$job_catalog 1567 job_catalog=/home/${remote_user}/job_queue 1499 1568 fi 1500 1569 scp $ssh_key $PORTOPT $job_to_send ${remote_user}@${remote_address}:${job_catalog}/$job_on_remhost … … 1503 1572 locat=scp; exit 1504 1573 fi 1505 if [[ $remote_host = ibms ]]1574 if [[ $remote_host = ibms || $remote_host = lcgeohu ]] 1506 1575 then 1507 1576 job_catalog=$job_catalog_save … … 1523 1592 then 1524 1593 ssh $SSH_PORTOPT $remote_address -l $remote_user "cd $job_catalog; $submcom $job_on_remhost" 1594 elif [[ $remote_host = lcgeohu ]] 1595 then 1596 ssh $ssh_key $SSH_PORTOPT $remote_address -l $remote_user "cd $job_catalog; $submcom $job_on_remhost" 1525 1597 else 1526 1598 ssh $ssh_key $SSH_PORTOPT $remote_address -l $remote_user "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost" … … 1530 1602 else 1531 1603 cd $job_catalog 1532 if [[ $(echo $local_host | cut -c1-3) = ibm || $(echo $local_host | cut -c1-6) = lccray || $local_host = lceddy ]]1604 if [[ $(echo $local_host | cut -c1-3) = ibm || $(echo $local_host | cut -c1-6) = lccray || $local_host = lceddy || $local_host = lcgeohu ]] 1533 1605 then 1534 1606 eval $submcom $job_on_remhost … … 1549 1621 # JOBFILE MUST NOT BE DELETED ON lctit/ibmku. THIS WILL BE DONE 1550 1622 # AT THE END OF THE JOB 1551 if [[ $local_host != lctit && $local_host != ibmku ]]1623 if [[ $local_host != lctit && $local_host != ibmku && $local_host != lcgeohu ]] 1552 1624 then 1553 1625 rm $job_on_remhost
Note: See TracChangeset
for help on using the changeset viewer.