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

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-08-08 11:59:59 -0500 (Thu, 08 Aug 2013)
New Revision: 6801

Modified:
   SwiftApps/Scattering/paintgrid/beagle.xml
   SwiftApps/Scattering/paintgrid/clean.sh
   SwiftApps/Scattering/paintgrid/setup.sh
   SwiftApps/Scattering/paintgrid/start-beagle
Log:
Add provider staging to swift properties
Use persistent coasters with beagle


Modified: SwiftApps/Scattering/paintgrid/beagle.xml
===================================================================
--- SwiftApps/Scattering/paintgrid/beagle.xml	2013-08-08 15:50:11 UTC (rev 6800)
+++ SwiftApps/Scattering/paintgrid/beagle.xml	2013-08-08 16:59:59 UTC (rev 6801)
@@ -1,19 +1,29 @@
 <config>
-  <pool handle="beagle">
-    <execution provider="coaster" jobmanager="ssh-cl:pbs" url="login1.beagle.ci.uchicago.edu"/>
-    <profile namespace="globus" key="userHomeOverride">/lustre/beagle/{env.USER}</profile>
-    <profile namespace="globus" key="jobsPerNode">24</profile>
-    <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>
-    <profile namespace="globus" key="maxnodes">1</profile>
-    <profile namespace="globus" key="nodeGranularity">1</profile>
-    <profile namespace="karajan" key="jobThrottle">1.20</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <workdirectory>/lustre/beagle/{env.USER}/swiftwork</workdirectory>
-  </pool>
+
+   <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="beagle">
+      <execution provider="coaster-persistent" url="http://localhost:59900" jobmanager="local:pbs"/>
+      <profile namespace="globus" key="userHomeOverride">/lustre/beagle/{env.USER}/swift.scripts</profile>
+      <profile namespace="globus" key="jobsPerNode">24</profile>
+      <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>
+      <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="initialScore">10000</profile>
+      <workdirectory>/lustre/beagle/{env.USER}/swiftwork</workdirectory>
+   </pool>
+
 </config>
 

Modified: SwiftApps/Scattering/paintgrid/clean.sh
===================================================================
--- SwiftApps/Scattering/paintgrid/clean.sh	2013-08-08 15:50:11 UTC (rev 6800)
+++ SwiftApps/Scattering/paintgrid/clean.sh	2013-08-08 16:59:59 UTC (rev 6801)
@@ -1,6 +1,3 @@
 #! /bin/sh
 
-rm -rf out _concurrent *swiftx *kml *~ paintgrid-* python-* swift.log
-
-
-
+rm -rf out _concurrent *swiftx *kml *~ paintgrid-* python-* swift.log beagle-pid beagle-log

Modified: SwiftApps/Scattering/paintgrid/setup.sh
===================================================================
--- SwiftApps/Scattering/paintgrid/setup.sh	2013-08-08 15:50:11 UTC (rev 6800)
+++ SwiftApps/Scattering/paintgrid/setup.sh	2013-08-08 16:59:59 UTC (rev 6801)
@@ -37,14 +37,16 @@
   mkdir -p $HOME/.swift
 fi
 
+# Try to make things easier by assuming username are the same on orthros and beagle
+sed -i s/davidk/$USER/g start-beagle 
+
 cat >>$HOME/.swift/swift.properties <<END
-
 # Properties for Swift Tutorial
 sites.file=sites.xml
 tc.file=apps
 
 # Data and status staging modes:
-use.provider.staging=false
+use.provider.staging=true
 provider.staging.pin.swiftfiles=false
 use.wrapper.staging=false
 status.mode=provider
@@ -57,3 +59,5 @@
 file.gc.enabled=false
 file.gc.enabled=false
 END
+
+

Modified: SwiftApps/Scattering/paintgrid/start-beagle
===================================================================
--- SwiftApps/Scattering/paintgrid/start-beagle	2013-08-08 15:50:11 UTC (rev 6800)
+++ SwiftApps/Scattering/paintgrid/start-beagle	2013-08-08 16:59:59 UTC (rev 6801)
@@ -1,4 +1,4 @@
 ssh -n login1.beagle.ci.uchicago.edu -L 59900:localhost:59900 \
-  'export SWIFT_USERHOME=/lustre/beagle/wilde/swift.scripts;
-   PATH=$HOME/swift/rev/swift-0.94.1/bin:$PATH;
+  'export SWIFT_USERHOME=/lustre/beagle/davidk/swift.scripts;
+   PATH=/home/wilde/swift/rev/swift-0.94.1/bin:$PATH;
    coaster-service -nosec -p 59900 1>&2 & echo $!; sleep 99999' 1>beagle-pid 2>beagle-log &