[Swift-commit] r3968 - SwiftApps/SwiftR/Swift/exec

[noreply at svn.ci.uchicago.edu]

Author: wilde
Date: 2011-01-15 17:28:25 -0600 (Sat, 15 Jan 2011)
New Revision: 3968

Modified:
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
Interim changes for SGE support, from siraf.

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-01-15 03:08:22 UTC (rev 3967)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-01-15 23:28:25 UTC (rev 3968)
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-set -x
+# set -x
 
 export TRAPEVENTS="EXIT 1 2 3 15"  # Signals and conditions to trap
 
@@ -143,11 +143,10 @@
 
 # FIXME: for big systems like Ranger, need to use ssh_tree to avoid socket FD exhastion?
 
-echo about to define make-sge
+echo def make-sge-submit-file
 
 make-sge-submit-file()
 {
-echo in $0
   if [ $queue != NONE ]; then
     queueDirective="#$ -q $queue"
   else
@@ -158,14 +157,14 @@
   else
     projectDirective=""
   fi
-  if [ $perEnv != NONE ]; then
-    parEnvDirective="#$ -pe $parEnv $(($nodes*$cores))
+  if [ $parEnv != NONE ]; then
+    parEnvDirective="#$ -pe $parEnv $(($nodes*$cores))"
   else
     parEnvDirective=""
   fi
 
 #  rcmd="qrsh" # FIXME - need to set on system basis; qrsh works for siraf
-  
+
 cat >batch.sub <<END
 #!/bin/bash
 #$ -S /bin/bash
@@ -173,13 +172,13 @@
 #$ -e $HOME
 #$ -N SwiftR
 #$ -l h_rt=$time
-# #$ -v WORKER_LOGGING_LEVEL=NONE
 #$ -V
-
 $parEnvDirective
 $queueDirective
 $projectDirective
 
+# $ -v WORKER_LOGGING_LEVEL=NONE
+
 # Ranger Site-specific:
 # $ -pe 16way 256
 # $ -q development
@@ -229,8 +228,8 @@
 usage()
 {
   echo >&2 "usage: $0 -c cores -h 'host1 ... hostN' -n nodes -q queue -s server -p parallelJobs -t walltime"
-  echo >&2 "  valid servers: local, ssh, pbs, pbsf (pbs with firewalled workers)"
-  echo >&2 "  defaults:  cores=2 nodes=1 queue=none server=local parallelJobs=10 walltime=00:30:00 (hh:mm:ss) "
+  echo >&2 "  valid servers: local, ssh, pbs, pbsf (for firewalled worker nodes), sge"
+  echo >&2 "  defaults:  cores=2 nodes=1 queue=none server=local parallelJobs=10 walltime=00:30:00 (hh:mm:ss)"
 }
 
 verify-is-one-of()
@@ -294,7 +293,7 @@
 parEnv=NONE
 
 rcmd=ssh      # rcmd: ssh (typical) or qrsh (eg for siraf with node login restrictions)
-workmode=slot # slot: start one worker on each slot; node: start on worker for all slots on a node
+workmode=slot # slot: start one worker on each slot; node: start one worker for all slots on a node
 
 while [ $# -gt 0 ]
 do