[Swift-commit] r8292 - SwiftApps/subjobs

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-10-22 15:39:53 -0500 (Wed, 22 Oct 2014)
New Revision: 8292

Modified:
   SwiftApps/subjobs/README.txt
   SwiftApps/subjobs/bg.sh
   SwiftApps/subjobs/docbuild
Log:
document bg.sh

Modified: SwiftApps/subjobs/README.txt
===================================================================
--- SwiftApps/subjobs/README.txt	2014-10-22 20:30:26 UTC (rev 8291)
+++ SwiftApps/subjobs/README.txt	2014-10-22 20:39:53 UTC (rev 8292)
@@ -210,7 +210,6 @@
 ----------
 The key driver of the Swift sub-block jobs is a script called +bg.sh+ that does the sub-block jobs calculations and othe chores for the users. The script looks as follows:
 
-[source]
 ----
 include::bg.sh[]
 ----

Modified: SwiftApps/subjobs/bg.sh
===================================================================
--- SwiftApps/subjobs/bg.sh	2014-10-22 20:30:26 UTC (rev 8291)
+++ SwiftApps/subjobs/bg.sh	2014-10-22 20:39:53 UTC (rev 8292)
@@ -1,11 +1,8 @@
 #! /bin/bash
 
-# Note: This path is for Cetus only
-#export PATH=/soft/cobalt/cetus/bgq_hardware_mapper:$PATH
-# Note: This path is for Mira or Vesta
-
 mname=$(hostname)
 
+# vesta and mira has different path than cetus
 if [[ $mname == *vesta* || $mname == *mira* ]]
 then
     export PATH=/soft/cobalt/bgq_hardware_mapper:$PATH
@@ -13,7 +10,8 @@
     export PATH=/soft/cobalt/cetus/bgq_hardware_mapper:$PATH    
 fi
 
-
+# Prepare shape based on subblock size
+# provided by user in sites environment
 case "$SUBBLOCK_SIZE" in
 8) SHAPE="1x2x2x2x1"
 ;;
@@ -33,7 +31,7 @@
 ;;
 esac
 
-
+# If subblock size is provided, do subblock business
 if [ "$SUBBLOCK_SIZE"_ != "_" ]
 then
     export SWIFT_SUBBLOCKS=$(get-corners.py "$COBALT_PARTNAME" $SHAPE)
@@ -50,6 +48,7 @@
     
     CORNER=${SWIFT_SUBBLOCK_ARRAY[$SWIFT_JOB_SLOT]}
     
+    #Some logging
     echo "$0": running BLOCK="$COBALT_PARTNAME" SLOT="$SWIFT_JOB_SLOT"
     echo "$0": running cmd: "$0" args: "$@"
     echo "$0": running runjob  --block "$COBALT_PARTNAME" --corner "$CORNER" --shape "$SHAPE" --ranks-per-node 1 : "$REMAINING_ARGS"
@@ -59,6 +58,7 @@
     
     echo "Runjob finished."
 else
+    # run w/o subblocks if no subblock size provided
     echo "Running in nonsubblock mode."
     runjob --strace 0 --block "$COBALT_PARTNAME" -p 16 : "$@"
 fi

Modified: SwiftApps/subjobs/docbuild
===================================================================
--- SwiftApps/subjobs/docbuild	2014-10-22 20:30:26 UTC (rev 8291)
+++ SwiftApps/subjobs/docbuild	2014-10-22 20:39:53 UTC (rev 8292)
@@ -2,7 +2,7 @@
 
 if [ -z $1 ] ; then
 
-    asciidoc -a toc -a toclevels=2  -a max-width=750px  -a textwidth=80 -o /home/$(whoami)/public_html/subjobs.html README.txt
+    asciidoc -a toc -a numbered -a toclevels=2  -a max-width=750px  -a textwidth=80 -o /home/$(whoami)/public_html/subjobs.html README.txt
 else
-    asciidoc -a toc -a toclevels=2  -a max-width=750px  -a textwidth=80 -o "$1" README.txt
+    asciidoc -a toc -a numbered -a toclevels=2  -a max-width=750px  -a textwidth=80 -o "$1" README.txt
 fi