[Swift-commit] r4536 - in SwiftApps/Montage: exec templates

jonmon at ci.uchicago.edu jonmon at ci.uchicago.edu
Wed Jun 1 09:20:11 CDT 2011 

Author: jonmon
Date: 2011-06-01 09:20:10 -0500 (Wed, 01 Jun 2011)
New Revision: 4536

Added:
   SwiftApps/Montage/templates/local.xml
   SwiftApps/Montage/templates/pads-diff-coasters.xml
   SwiftApps/Montage/templates/pads-fit-coasters.xml
   SwiftApps/Montage/templates/pads-proj-coasters.xml
Removed:
   SwiftApps/Montage/templates/pads-coasters.xml
Modified:
   SwiftApps/Montage/exec/montage.sh
Log:
o SwiftApps/Montage/exec/montage.sh
  -- Added functionality to specify a different number of workers for each stage

o SwiftApps/Montage/templates/pads-proj-coasters.xml
o SwiftApps/Montage/templates/pads-diff-coasters.xml
o SwiftApps/Montage/templates/pads-fit-coasters.xml
  -- Added template files for each stage in the workflow

o SwiftApps/Montage/templates/local.xml
  -- Added template for the local operations

o SwiftApps/Montage/templates/pads-coasters.xml
  -- Removed template. Now split up into seperate stages


Modified: SwiftApps/Montage/exec/montage.sh
===================================================================
--- SwiftApps/Montage/exec/montage.sh	2011-05-31 20:14:17 UTC (rev 4535)
+++ SwiftApps/Montage/exec/montage.sh	2011-06-01 14:20:10 UTC (rev 4536)
@@ -15,16 +15,29 @@
 mkdir ${WORK_DIRECTORY}
 
 if [ $HOSTNAME == "login2.pads.ci.uchicago.edu" ]; then
-    echo "#site pads-coasters.xml internalhostname=192.5.86.6" >> sites.properties
+    echo "#site pads-proj-coasters.xml internalhostname=192.5.86.6" >> sites.properties
+    echo "#site pads-diff-coasters.xml internalhostname=192.5.86.6" >> sites.properties
+    echo "#site pads-fit-coasters.xml internalhostname=192.5.86.6"  >> sites.properties
 elif [ $HOSTNAME == "login1.pads.ci.uchicago.edu" ]; then
-    echo "#site pads-coasters.xml internalhostname=192.5.86.5" >> sites.properties
+    echo "#site pads-proj-coasters.xml internalhostname=192.5.86.5" >> sites.properties
+    echo "#site pads-diff-coasters.xml internalhostname=192.5.86.5" >> sites.properties
+    echo "#site pads-fit-coasters.xml internalhostname=192.5.86.5"  >> sites.properties
 fi
 
-echo "#site pads-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
-echo "#site pads-coasters.xml slots=$1" >> sites.properties
+echo "#site pads-proj-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
+echo "#site pads-proj-coasters.xml slots=$1"                               >> sites.properties
 
-gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-coasters.xml > sites.xml
+echo "#site pads-diff-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
+echo "#site pads-diff-coasters.xml slots=$1"                               >> sites.properties
 
+echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
+echo "#site pads-fit-coasters.xml slots=$1"                               >> sites.properties
+
+gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml >  sites.xml
+gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-diff-coasters.xml >> sites.xml
+gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-fit-coasters.xml  >> sites.xml
+gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties local.xml              >> sites.xml
+
 rm -f sites.properties
 
 mv sites.xml ${WORK_DIRECTORY}

Added: SwiftApps/Montage/templates/local.xml
===================================================================
--- SwiftApps/Montage/templates/local.xml	                        (rev 0)
+++ SwiftApps/Montage/templates/local.xml	2011-06-01 14:20:10 UTC (rev 4536)
@@ -0,0 +1,7 @@
+<pool handle="localhost">
+  <execution provider="local" />
+  <filesystem provider="local" />
+  <profile key="jobThrottle" namespace="karajan">.05</profile>
+  <profile key="SWIFT_GEN_SCRIPTS" namespace="env">1</profile>
+  <workdirectory>_WORK_</workdirectory>
+</pool>

Deleted: SwiftApps/Montage/templates/pads-coasters.xml
===================================================================
--- SwiftApps/Montage/templates/pads-coasters.xml	2011-05-31 20:14:17 UTC (rev 4535)
+++ SwiftApps/Montage/templates/pads-coasters.xml	2011-06-01 14:20:10 UTC (rev 4536)
@@ -1,15 +0,0 @@
-<pool handle="pads">
-  <execution jobmanager="local:pbs" provider="coaster" />
-  <filesystem provider="local" />
-  <profile key="maxtime" namespace="globus">3600</profile>
-  <profile key="internalhostname" namespace="globus">_INTERNALHOSTNAME_</profile>
-  <profile key="jobsPerNode" namespace="globus">1</profile>
-  <profile key="slots" namespace="globus">_SLOTS_</profile>
-  <profile key="nodeGranularity" namespace="globus">1</profile>
-  <profile key="maxNodes" namespace="globus">1</profile>
-  <profile key="queue" namespace="globus">fast</profile>
-  <profile key="jobThrottle" namespace="karajan">1</profile>
-  <profile key="initialScore" namespace="karajan">10000</profile>
-  <profile key="SWIFT_GEN_SCRIPTS" namespace="env">1</profile>
-  <workdirectory>_WORK_</workdirectory>
-</pool>

Added: SwiftApps/Montage/templates/pads-diff-coasters.xml
===================================================================
--- SwiftApps/Montage/templates/pads-diff-coasters.xml	                        (rev 0)
+++ SwiftApps/Montage/templates/pads-diff-coasters.xml	2011-06-01 14:20:10 UTC (rev 4536)
@@ -0,0 +1,15 @@
+<pool handle="pads-diff-coasters">
+  <execution jobmanager="local:pbs" provider="coaster" />
+  <filesystem provider="local" />
+  <profile key="maxtime"           namespace="globus">3600</profile>
+  <profile key="internalhostname"  namespace="globus">_INTERNALHOSTNAME_</profile>
+  <profile key="jobsPerNode"       namespace="globus">1</profile>
+  <profile key="slots"             namespace="globus">_SLOTS_</profile>
+  <profile key="nodeGranularity"   namespace="globus">1</profile>
+  <profile key="maxNodes"          namespace="globus">1</profile>
+  <profile key="queue"             namespace="globus">fast</profile>
+  <profile key="jobThrottle"       namespace="karajan">2</profile>
+  <profile key="initialScore"      namespace="karajan">100</profile>
+  <profile key="SWIFT_GEN_SCRIPTS" namespace="env">1</profile>
+  <workdirectory>_WORK_</workdirectory>
+</pool>

Added: SwiftApps/Montage/templates/pads-fit-coasters.xml
===================================================================
--- SwiftApps/Montage/templates/pads-fit-coasters.xml	                        (rev 0)
+++ SwiftApps/Montage/templates/pads-fit-coasters.xml	2011-06-01 14:20:10 UTC (rev 4536)
@@ -0,0 +1,15 @@
+<pool handle="pads-fit-coasters">
+  <execution jobmanager="local:pbs" provider="coaster" />
+  <filesystem provider="local" />
+  <profile key="maxtime"           namespace="globus">3600</profile>
+  <profile key="internalhostname"  namespace="globus">_INTERNALHOSTNAME_</profile>
+  <profile key="jobsPerNode"       namespace="globus">1</profile>
+  <profile key="slots"             namespace="globus">_SLOTS_</profile>
+  <profile key="nodeGranularity"   namespace="globus">1</profile>
+  <profile key="maxNodes"          namespace="globus">1</profile>
+  <profile key="queue"             namespace="globus">fast</profile>
+  <profile key="jobThrottle"       namespace="karajan">2</profile>
+  <profile key="initialScore"      namespace="karajan">100</profile>
+  <profile key="SWIFT_GEN_SCRIPTS" namespace="env">1</profile>
+  <workdirectory>_WORK_</workdirectory>
+</pool>

Added: SwiftApps/Montage/templates/pads-proj-coasters.xml
===================================================================
--- SwiftApps/Montage/templates/pads-proj-coasters.xml	                        (rev 0)
+++ SwiftApps/Montage/templates/pads-proj-coasters.xml	2011-06-01 14:20:10 UTC (rev 4536)
@@ -0,0 +1,15 @@
+<pool handle="pads-proj-coasters">
+  <execution jobmanager="local:pbs" provider="coaster" />
+  <filesystem provider="local" />
+  <profile key="maxtime"           namespace="globus">3600</profile>
+  <profile key="internalhostname"  namespace="globus">_INTERNALHOSTNAME_</profile>
+  <profile key="jobsPerNode"       namespace="globus">1</profile>
+  <profile key="slots"             namespace="globus">_SLOTS_</profile>
+  <profile key="nodeGranularity"   namespace="globus">1</profile>
+  <profile key="maxNodes"          namespace="globus">1</profile>
+  <profile key="queue"             namespace="globus">fast</profile>
+  <profile key="jobThrottle"       namespace="karajan">2</profile>
+  <profile key="initialScore"      namespace="karajan">100</profile>
+  <profile key="SWIFT_GEN_SCRIPTS" namespace="env">1</profile>
+  <workdirectory>_WORK_</workdirectory>
+</pool>

More information about the Swift-commit mailing list