Changeset 2295 for palm/trunk/SCRIPTS/subjob

Timestamp:

Jun 27, 2017 2:25:52 PM (7 years ago)

Author:

raasch

Message:

script adjustments for using lcgeohu, cpp_opts removed

File:

• palm/trunk/SCRIPTS/subjob (modified) (11 diffs)

palm/trunk/SCRIPTS/subjob

@@ -28 +28 @@
 # -----------------
 # $Id$
+# adjustments for using lcgeohu (cirrus @ HUB)
+# 
+# 2266 2017-06-09 09:27:21Z raasch
 # nech related parts removed
 # 
@@ -279 +282 @@
      (vorias)                local_address=172.20.25.43;   local_host=lcmuk;;
      (*.cc.kyushu-u.ac.jp)   local_address=133.5.4.129;    local_host=ibmku;;
+     (*.cluster)             local_address=192.168.1.254;  local_host=lcgeohu;;
      (*)                     printf "\n  +++ \"$local_host\" unknown";
                              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;;
         (lceddy)  remote_address=eddy.hpc.uni-oldenburg.de; submcom=sbatch;;
+        (lcgeohu) remote_address=cirrus.geo.hu-berlin.de; submcom=sbatch;;
         (lckyoto) remote_address=133.3.51.11; submcom=/thin/local/bin/qsub;;
         (lck)     remote_address=165.132.26.61; submcom=/usr/torque/bin/qsub;;
@@ -964 +969 @@
     fi
 
+ elif [[ $remote_host = lcgeohu ]]
+ then
+
+    if [[ $email_notification = none ]]
+    then
+       notify_user=""
+    else
+       notify_user="#SBATCH --mail-type=ALL"
+    fi
+
+    if [[ $numprocs != 0 ]]
+    then
+       cat > $job_to_send << %%END%%
+#!/bin/bash
+#SBATCH --job-name=$job_name
+#SBATCH --ntasks=$processes_per_node
+#SBATCH --time=$timestring
+#SBATCH --output=$remote_dayfile
+#SBATCH --error=$remote_dayfile
+#SBATCH --qos=short
+$notify_user
+
+$init_cmds
+$module_calls
+
+%%END%%
+
+    else
+       cat > $job_to_send << %%END%%
+#!/bin/bash
+#SBATCH --job-name=$job_name
+#SBATCH --ntasks=$processes_per_node
+#SBATCH --output=$remote_dayfile
+#SBATCH --error=$remote_dayfile
+#SBATCH -l ncpus=1
+
+$init_cmds
+$module_calls
+
+%%END%%
+
+    fi
+
  elif [[ $remote_host = lckiaps ]]
  then
@@ -1223 +1271 @@
     echo "trap '"                               >>  $job_to_send
     echo "set +vx"                              >>  $job_to_send
-    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 ]]
+    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 ]]
     then
        if [[ $remote_host = ibmh ]]
@@ -1398 +1446 @@
           echo "[[ \"\$for_subjob_to_do\" != \"\" ]]  &&  eval \$for_subjob_to_do"  >>  $job_to_send
           echo "%%END%%"                                 >>  $job_to_send
+
+       elif [[ $remote_host = lcgeohu ]]
+       then
+          echo "cat > scpjob.$identifier << %%END%%"        >>  $job_to_send
+          echo "#!/bin/bash"                             >>  $job_to_send
+          echo "#SBATCH --job-name=job_protocol_transfer" >>  $job_to_send
+          echo "#SBATCH -t 00:20:00"                     >>  $job_to_send
+          echo "#SBATCH -N 1"                            >>  $job_to_send
+          echo "#SBATCH -n 1"                            >>  $job_to_send
+          echo "#SBATCH -o \$HOME/job_queue/last_job_transfer_protocol"      >>  $job_to_send
+          echo "#SBATCH -o $remote_dayfile"              >>  $job_to_send
+          echo "#SBATCH -e $remote_dayfile"              >>  $job_to_send
+          echo " "                                       >>  $job_to_send
+          echo "set -x"                                  >>  $job_to_send
+          echo "sbatch  scpjob.$identifier"              >>  $job_to_send
+          echo "%%END%%"                                 >>  $job_to_send
+
        else
 
@@ -1497 +1562 @@
           job_catalog_save=$job_catalog
           job_catalog=job_queue
+       elif [[ $remote_host = lcgeohu ]]
+       then
+          job_catalog_save=$job_catalog
+          job_catalog=/home/${remote_user}/job_queue
        fi
        scp  $ssh_key  $PORTOPT  $job_to_send  ${remote_user}@${remote_address}:${job_catalog}/$job_on_remhost
@@ -1503 +1572 @@
           locat=scp; exit
        fi
-       if [[ $remote_host = ibms ]]
+       if [[ $remote_host = ibms  ||  $remote_host = lcgeohu ]]
        then
           job_catalog=$job_catalog_save
@@ -1523 +1592 @@
        then
           ssh  $SSH_PORTOPT $remote_address  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost"
+       elif [[ $remote_host = lcgeohu ]]
+       then
+          ssh  $ssh_key  $SSH_PORTOPT $remote_address  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost"
        else
           ssh  $ssh_key  $SSH_PORTOPT $remote_address  -l $remote_user  "cd $job_catalog; $submcom $job_on_remhost; rm $job_on_remhost"
@@ -1530 +1602 @@
     else
        cd  $job_catalog
-       if [[ $(echo $local_host | cut -c1-3) = ibm  ||  $(echo $local_host | cut -c1-6) = lccray || $local_host = lceddy ]]
+       if [[ $(echo $local_host | cut -c1-3) = ibm  ||  $(echo $local_host | cut -c1-6) = lccray || $local_host = lceddy || $local_host = lcgeohu ]]
        then
           eval  $submcom  $job_on_remhost
@@ -1549 +1621 @@
           # JOBFILE MUST NOT BE DELETED ON lctit/ibmku. THIS WILL BE DONE
           # AT THE END OF THE JOB
-       if [[ $local_host != lctit  &&  $local_host != ibmku ]]
+       if [[ $local_host != lctit  &&  $local_host != ibmku  &&  $local_host != lcgeohu ]]
        then
           rm  $job_on_remhost