[Swift-commit] r6812 - SwiftApps/Scattering/paintgrid

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-08-08 17:02:57 -0500 (Thu, 08 Aug 2013)
New Revision: 6812

Modified:
   SwiftApps/Scattering/paintgrid/apps
   SwiftApps/Scattering/paintgrid/beagle.xml
   SwiftApps/Scattering/paintgrid/orthros.xml
   SwiftApps/Scattering/paintgrid/paintgrid.swift
   SwiftApps/Scattering/paintgrid/sites.xml
Log:
Use tiny image by default
Add more comments in sites file


Modified: SwiftApps/Scattering/paintgrid/apps
===================================================================
--- SwiftApps/Scattering/paintgrid/apps	2013-08-08 21:43:00 UTC (rev 6811)
+++ SwiftApps/Scattering/paintgrid/apps	2013-08-08 22:02:57 UTC (rev 6812)
@@ -1,3 +1,4 @@
 localhost local_python python
+local python python
 orthros python python
 beagle python python

Modified: SwiftApps/Scattering/paintgrid/beagle.xml
===================================================================
--- SwiftApps/Scattering/paintgrid/beagle.xml	2013-08-08 21:43:00 UTC (rev 6811)
+++ SwiftApps/Scattering/paintgrid/beagle.xml	2013-08-08 22:02:57 UTC (rev 6812)
@@ -15,12 +15,14 @@
       <profile namespace="globus" key="lowOverAllocation">100</profile>
       <profile namespace="globus" key="highOverAllocation">100</profile>
       <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile> 
-      <profile namespace="globus" key="maxtime">3600</profile>
-      <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-      <profile namespace="globus" key="slots">5</profile>
+    
+      <!-- Set estimated app time (maxwalltime) and requested job time (maxtime) here: -->
+      <profile namespace="globus" key="maxtime">3600</profile>         <!-- seconds -->
+      <profile namespace="globus" key="maxWalltime">00:05:00</profile> <!-- hh:mm:ss -->
+      <profile namespace="globus" key="slots">5</profile>              <!-- Maximum number of pbs jobs -->
       <profile namespace="globus" key="maxnodes">1</profile>
       <profile namespace="globus" key="nodeGranularity">1</profile>
-      <profile namespace="karajan" key="jobThrottle">4.80</profile>
+      <profile namespace="karajan" key="jobThrottle">4.80</profile>    <!-- 480 active tasks -->
       <profile namespace="karajan" key="initialScore">10000</profile>
       <workdirectory>/lustre/beagle/{env.USER}/swiftwork</workdirectory>
    </pool>

Modified: SwiftApps/Scattering/paintgrid/orthros.xml
===================================================================
--- SwiftApps/Scattering/paintgrid/orthros.xml	2013-08-08 21:43:00 UTC (rev 6811)
+++ SwiftApps/Scattering/paintgrid/orthros.xml	2013-08-08 22:02:57 UTC (rev 6812)
@@ -1,17 +1,32 @@
 <config>
+
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/swiftwork</workdirectory>
+   </pool>
+
   <pool handle="orthros">
     <execution provider="coaster" jobmanager="local:sge"/>
-    <profile namespace="globus" key="jobsPerNode">1</profile>
-    <profile namespace="globus" key="maxWalltime">00:15:00</profile>
+    <profile namespace="globus" key="jobsPerNode">1</profile> <!-- apps per node. On orthros, a node=1 cpu -->
+
+    <!-- Set estimated app time (maxwalltime) and requested job time (maxtime) here: -->
+    <profile namespace="globus" key="maxWalltime">00:15:00</profile> <!-- hh:mm:ss -->
+    <profile namespace="globus" key="maxtime">1200</profile>         <!-- seconds -->
+    <profile namespace="globus" key="slots">10</profile>             <!-- maximum number of SGE jobs -->
     <profile namespace="globus" key="highOverAllocation">100</profile>
     <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="slots">10</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
+
+    <!-- Define queue and parallel environment -->
     <profile namespace="globus" key="queue">sec1all.q</profile> 
     <profile namespace="globus" key="pe">sec1_all</profile> 
-    <profile namespace="globus" key="maxtime">1200</profile>
     <profile namespace="globus" key="jobThrottle">10.00</profile>
+
+    <!-- Set data staging model and work dir here: -->
     <filesystem provider="local"/>
-    <workdirectory>{env.HOME}/swiftwork</workdirectory>
+    <workdirectory>{env.HOME}/swiftwork</workdirectory> <!-- Use env variable HOME to set default work directory -->
   </pool>
 </config>

Modified: SwiftApps/Scattering/paintgrid/paintgrid.swift
===================================================================
--- SwiftApps/Scattering/paintgrid/paintgrid.swift	2013-08-08 21:43:00 UTC (rev 6811)
+++ SwiftApps/Scattering/paintgrid/paintgrid.swift	2013-08-08 22:02:57 UTC (rev 6812)
@@ -22,7 +22,7 @@
 # Command line args to this script
 
 file   params   <single_file_mapper;file=@arg("params", "genpoints.params")>;
-file   image    <single_file_mapper;file=@arg("image",  "UNSPECIFIED.tif")>;
+file   image    <single_file_mapper;file=@arg("image",  "data.0001.tiny")>;
 global string runTime = @arg("runTime","0.0");
 global string runDir  = @java("java.lang.System","getProperty","user.dir");
 

Modified: SwiftApps/Scattering/paintgrid/sites.xml
===================================================================
--- SwiftApps/Scattering/paintgrid/sites.xml	2013-08-08 21:43:00 UTC (rev 6811)
+++ SwiftApps/Scattering/paintgrid/sites.xml	2013-08-08 22:02:57 UTC (rev 6812)
@@ -1,9 +1,19 @@
 <config>
+
    <pool handle="localhost">
       <execution provider="coaster" jobmanager="local:local"/>
-      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="jobThrottle">0</profile> <!-- Since running locally, set a maximum of 1 active job -->
       <profile namespace="karajan" key="initialScore">10000</profile>
       <filesystem provider="local"/>
       <workdirectory>{env.HOME}/swiftwork</workdirectory>
    </pool>
+
+   <pool handle="local">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile> <!-- Since running locally, set a maximum of 1 active job -->
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/swiftwork</workdirectory>
+   </pool>
+
 </config>