Changeset 1279

Timestamp:

Jan 28, 2014 12:10:14 PM (11 years ago)

Author:

raasch

Message:

tasks_per_node must not be an integral divisor of numprocs any more

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (5 diffs)
• subjob (modified) (2 diffs)

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# 
+# tasks_per_node must not be an integral divisor of numprocs any more. This was done
+# in order to remove annoying restrictions concerning the number of processors which
+# appear on machines with larger nodes (e.g. containing 24 cores). Without this
+# restriction, one of the nodes will not be completely filled with tasks. A respective
+# warning is given.
 #
 # Former revisions:
@@ -260 +264 @@
                            # effect may cause data loss when getopts is reading the
                            # script-option arguments
- typeset -i  cputime i ii iia iii iio icycle inode ival jobges jobsek last_char_int maxcycle minuten nodes pes sekunden tp1
+ typeset -i  cputime i ii iia iii iio icycle inode ival jobges jobsek last_char_int maxcycle minuten nodes pes remaining_pes sekunden tp1
 
 
@@ -1075 +1079 @@
        locat=tasks_per_node; (( iec = 0 )); exit 
     fi
+
+    if (( numprocs < tasks_per_node ))
+    then
+       printf "\n"
+       printf "\n  +++ tasks per node (-T) cannot exceed total number of processors (-X)"
+       printf "\n      given values: -T $tasks_per_node  -X $numprocs"
+       locat=tasks_per_node; (( iec = 0 )); exit 
+    fi
+
     if [[ $host != lcflow  &&  $host != lcxt5m ]]
     then
+       (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
        (( ival = $tasks_per_node ))
        (( pes = numprocs ))
-#          if [[ $(echo $package_list | grep -c dvrp_graphics+1PE) = 1 ]]
-#          then
-#             (( pes = pes - 1 ))
-#          fi
        (( ii = pes / ival ))
-       if (( pes - ii * ival > 0 ))
+       (( remaining_pes =  pes - ii * ival ))
+       if (( remaining_pes > 0 ))
        then
           printf "\n"
-          printf "\n  +++ tasks per node (option \"-T\") must be an integral"
+          printf "\n  +++ WARNING: tasks per node (option \"-T\") is not an integral"
           printf "\n      divisor of the total number of processors (option \"-X\")"
           printf "\n      values of this mrun-call: \"-T $tasks_per_node\" \"-X $numprocs\""
-          locat=tasks_per_node; (( iec = 0 )); exit 
+          printf "\n      One of the nodes is filled with $remaining_pes instead of $tasks_per_node tasks"
+          (( nodes = nodes + 1 ))
        fi
     fi
@@ -1116 +1128 @@
     then
        TOPT="-T $tasks_per_node"
-       (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
     fi
 
@@ -2103 +2114 @@
     spalte1="tasks per node:"; spalte2="$tasks_per_node (number of nodes: $nodes)"
     printf "| %-25s%-45s | \n" "$spalte1" "$spalte2"
+    if (( remaining_pes > 0 ))
+    then
+       spalte1=" "; spalte2="one of the nodes only filled with $remaining_pes tasks"
+       printf "| %-25s%-45s | \n" "$spalte1" "$spalte2"
+    fi
  fi
  if [[ $maximum_parallel_io_streams != $numprocs ]]

palm/trunk/SCRIPTS/subjob

@@ -23 +23 @@
 # Current revisions:
 # ------------------
-# 
+# node calculation modified due to changes in mrun (tasks_per_node must not be
+# an integral divisor of numprocs any more)
 #
 # Former revisions:
@@ -558 +559 @@
  if (( tasks_per_node != 0 ))
  then
-    (( nodes = numprocs / ( tasks_per_node * threads_per_task ) ))
+    (( nodes = ( numprocs - 1 ) / ( tasks_per_node * threads_per_task ) + 1 ))
  fi