Changeset 122

Timestamp:

Oct 19, 2007 9:08:46 AM (17 years ago)

Author:

letzel

Message:

Adjustments to mrun and subjob for lctit

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (7 diffs)
• subjob (modified) (4 diffs)

palm/trunk/SCRIPTS/mrun

@@ -132 +132 @@
      # 15/10/07 - Siggi  - Preliminary adjustments for lctit, based on Jin's
      #                     suggestions
+     # 19/10/07 - Marcus - further adjustments for lctit: add new optional 
+     #                     argument -g group_number, admit all sla* node_usage 
+     #                     queues
 
  
@@ -169 +172 @@
  fromhost=""
  global_revision=""
+ group_number=none
  host=""
  host_file=""
@@ -355 +359 @@
     # SHELLSCRIPT-OPTIONEN EINLESEN UND KOMMANDO NEU ZUSAMMENSETZEN, FALLS ES
     # FUER FOLGEJOBS BENOETIGT WIRD
- while  getopts  :a:AbBc:Cd:D:FG:h:H:i:IkK:m:M:n:o:Op:P:q:r:R:s:St:T:u:U:vxX:Y option
+ while  getopts  :a:AbBc:Cd:D:Fg:G:h:H:i:IkK:m:M:n:o:Op:P:q:r:R:s:St:T:u:U:vxX:Y option
  do
    case  $option  in
@@ -367 +371 @@
        (D)   cpp_opts="$cpp_opts $OPTARG"; mc="$mc -D$OPTARG";;
        (F)   job_on_file="-D"; mc="$mc -F";;
+       (g)   group_number=$OPTARG; mc="$mc -g$OPTARG";;
        (G)   global_revision=$OPTARG; mc="$mc -G'$OPTARG'";;
        (h)   host=$OPTARG; mc="$mc -h$OPTARG";;
@@ -1023 +1028 @@
        fi
     fi
-    if [[ $node_usage != shared  &&  $node_usage != not_shared  &&  $node_usage != sla3 ]]
+    if [[ $node_usage != shared  &&  $node_usage != not_shared  &&  "$(echo $node_usage | cut -c1-3)" != "sla" ]]
     then
        printf "\n"
@@ -2792 +2797 @@
                 mpirun  -np $numprocs  a.out  $ROPTS
              else
+                 (( mem_tsubame = 31.0 / $tasks_per_node ))
+                 echo "Memory for Tsubame in GB:", $mem_tsubame
 #                n1ge  -fore  -g 1S060156  -mpi $numprocs  -mem 4  -N palm  -q $queue  a.out  $ROPTS
-               /n1ge/TITECH_GRID/tools/bin/n1ge -fore -g 4S070143 -mpi $numprocs -smp 16 -mem 1.75 -N palm -rt 21600 -q $queue  a.out  $ROPTS
+               /n1ge/TITECH_GRID/tools/bin/n1ge -fore -g $group_number -mpi ${numprocs}:$tasks_per_node -mem $mem_tsubame -N palm -rt 21600 -q $queue  a.out  $ROPTS
              fi
 
@@ -3730 +3737 @@
     fi
 
-    subjob  $job_on_file  -h $host  -u $remote_username  -q $queue  -m $memory  -N $node_usage -t $cpumax  $XOPT  $TOPT  $OOPT  -n $fname  -v   $jobfile
+    subjob  $job_on_file  -h $host  -u $remote_username -g $group_number -q $queue  -m $memory  -N $node_usage -t $cpumax  $XOPT  $TOPT  $OOPT  -n $fname  -v   $jobfile
     rm -rf  $jobfile
 

palm/trunk/SCRIPTS/subjob

@@ -87 +87 @@
      # 15/10/07 - Siggi - preliminary adjustments for lctit based on Jin's
      #                    suggestions
-
+     # 19/10/07 - Marcus- add new optional argument -g group_number
 
 
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
  delete_dayfile=false 
+ group_number=none
  locat=normal
  no_default_queue=none
@@ -190 +191 @@
 
     # PROZEDUROPTIONEN EINLESEN
- while  getopts  :c:dDh:m:n:N:O:q:t:T:u:vX:  option
+ while  getopts  :c:dDg:h:m:n:N:O:q:t:T:u:vX:  option
  do
    case  $option  in
@@ -196 +197 @@
        (d)   delete_dayfile=true;;
        (D)   no_submit=true;;
+       (g)   group_number=$OPTARG;
        (h)   remote_host=$OPTARG;;
        (m)   memory=$OPTARG;;
@@ -747 +749 @@
        # OPTIONEN FUER SUBMIT-KOMMANDO ZUSAMMENSTELLEN
   #  submcom="$submcom  -N $job_name  -sgeout $remote_dayfile  -q default"
-    submcom="$submcom -g 4SO7O143 -N $job_name -rt 4320 -sgeout $remote_dayfile  -q sla3"
+    submcom="$submcom -g $group_number -N $job_name -rt 4320 -sgeout $remote_dayfile  -q $node_usage "
 
  else