[Swift-commit] r7154 - in SwiftApps/swiftrun-demo: . full-site-definition partial-site-definition
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Sun Oct 13 00:01:30 CDT 2013
Author: davidk
Date: 2013-10-13 00:01:30 -0500 (Sun, 13 Oct 2013)
New Revision: 7154
Added:
SwiftApps/swiftrun-demo/full-site-definition/
SwiftApps/swiftrun-demo/full-site-definition/README
SwiftApps/swiftrun-demo/full-site-definition/catsn.swift
SwiftApps/swiftrun-demo/full-site-definition/data.txt
SwiftApps/swiftrun-demo/full-site-definition/swift.properties
SwiftApps/swiftrun-demo/partial-site-definition/
SwiftApps/swiftrun-demo/partial-site-definition/README
SwiftApps/swiftrun-demo/partial-site-definition/catsn.swift
SwiftApps/swiftrun-demo/partial-site-definition/data.txt
SwiftApps/swiftrun-demo/partial-site-definition/swift.properties
Removed:
SwiftApps/swiftrun-demo/catsn.swift
SwiftApps/swiftrun-demo/data.txt
SwiftApps/swiftrun-demo/swift.properties
Modified:
SwiftApps/swiftrun-demo/README
Log:
Create directories for some of the nswift/swiftrun use cases
Modified: SwiftApps/swiftrun-demo/README
===================================================================
--- SwiftApps/swiftrun-demo/README 2013-10-13 01:42:09 UTC (rev 7153)
+++ SwiftApps/swiftrun-demo/README 2013-10-13 05:01:30 UTC (rev 7154)
@@ -1,3 +1,5 @@
+Full swiftrun documentation at http://swiftlang.org/guides/trunk/designs/swiftrun.html
+
* You only need only one configuration file: swift.properties.
* Configuration becomes easier. No XML.
Deleted: SwiftApps/swiftrun-demo/catsn.swift
===================================================================
--- SwiftApps/swiftrun-demo/catsn.swift 2013-10-13 01:42:09 UTC (rev 7153)
+++ SwiftApps/swiftrun-demo/catsn.swift 2013-10-13 05:01:30 UTC (rev 7154)
@@ -1,13 +0,0 @@
-type file;
-
-app (file o) cat (file i)
-{
- cat @i stdout=@o;
-}
-
-file out[]<simple_mapper; location="output", prefix="catsn.",suffix=".out">;
-
-foreach j in [1:toInt(arg("n","1"))] {
- file data <"data.txt">;
- out[j] = cat(data);
-}
Deleted: SwiftApps/swiftrun-demo/data.txt
===================================================================
--- SwiftApps/swiftrun-demo/data.txt 2013-10-13 01:42:09 UTC (rev 7153)
+++ SwiftApps/swiftrun-demo/data.txt 2013-10-13 05:01:30 UTC (rev 7154)
@@ -1 +0,0 @@
-fjdlksafjlsd
Added: SwiftApps/swiftrun-demo/full-site-definition/README
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/README (rev 0)
+++ SwiftApps/swiftrun-demo/full-site-definition/README 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1,24 @@
+This example shows defining site defintions in the swift.properties files.
+
+You can use the x.y.z=foo format:
+
+site.sandyb.provider=local:slurm
+site.sandyb.jobspernode=16
+site.sandyb.maxWalltime=00:05:00
+site.sandyb.queue=sandyb
+site.sandyb.initialScore=10000
+site.sandyb.filesystem=local
+site.sandyb.workdirectory=/scratch/midway/$USER/work
+
+Or the block format to group site properties
+
+site.westmere {
+ provider=local:slurm
+ jobsPerNode=12
+ maxWalltime=00:05:00
+ queue=westmere
+ initialScore=10000
+ filesystem=local
+ workdirectory=/scratch/midway/$USER/work
+}
+
Added: SwiftApps/swiftrun-demo/full-site-definition/catsn.swift
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/catsn.swift (rev 0)
+++ SwiftApps/swiftrun-demo/full-site-definition/catsn.swift 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1,13 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location="output", prefix="catsn.",suffix=".out">;
+
+foreach j in [1:toInt(arg("n","1"))] {
+ file data <"data.txt">;
+ out[j] = cat(data);
+}
Added: SwiftApps/swiftrun-demo/full-site-definition/data.txt
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/data.txt (rev 0)
+++ SwiftApps/swiftrun-demo/full-site-definition/data.txt 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1 @@
+fjdlksafjlsd
Added: SwiftApps/swiftrun-demo/full-site-definition/swift.properties
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/swift.properties (rev 0)
+++ SwiftApps/swiftrun-demo/full-site-definition/swift.properties 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1,24 @@
+site.sandyb.provider=local:slurm
+site.sandyb.jobspernode=16
+site.sandyb.maxWalltime=00:05:00
+site.sandyb.queue=sandyb
+site.sandyb.initialScore=10000
+site.sandyb.filesystem=local
+site.sandyb.workdirectory=/scratch/midway/$USER/work
+
+site.westmere {
+ provider=local:slurm
+ jobsPerNode=12
+ maxWalltime=00:05:00
+ queue=westmere
+ initialScore=10000
+ filesystem=local
+ workdirectory=/scratch/midway/$USER/work
+}
+
+app.sandyb.echo=/bin/echo
+app.westmere.echo=/bin/echo
+app.*.cat=/bin/cat
+
+sitedir.keep=true
+wrapperlog.always.transfer=true
Added: SwiftApps/swiftrun-demo/partial-site-definition/README
===================================================================
--- SwiftApps/swiftrun-demo/partial-site-definition/README (rev 0)
+++ SwiftApps/swiftrun-demo/partial-site-definition/README 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1,23 @@
+On midway, run "module load swift-conf"
+
+This sets an environment variable called SWIFT_SITE_CONF, which points to a
+directory containing a swift.properties. The file contains site definitions for all the slurm
+partitions on midway. When you run nswift, the SWIFT_SITE_CONF environment variable is read
+and added to your swift.properties path search.
+
+The search path is:
+1. The etc/swift.properties included with the Swift distribution.
+2. $SWIFT_SITE_CONF/swift.properties - used for defining site templates.
+3. $HOME/.swift/swift.properties
+4. The swift.properties in your current directory.
+
+This example will use the default definition for midway, but only override the maxwalltime
+for the sandyb queue. The swift.properties in this directory looks like:
+
+site.sandyb.maxWalltime=00:05:00
+app.*.cat=/bin/cat
+
+To run:
+
+nswift -sites sandyb,westmere catsn.swift
+
Added: SwiftApps/swiftrun-demo/partial-site-definition/catsn.swift
===================================================================
--- SwiftApps/swiftrun-demo/partial-site-definition/catsn.swift (rev 0)
+++ SwiftApps/swiftrun-demo/partial-site-definition/catsn.swift 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1,13 @@
+type file;
+
+app (file o) cat (file i)
+{
+ cat @i stdout=@o;
+}
+
+file out[]<simple_mapper; location="output", prefix="catsn.",suffix=".out">;
+
+foreach j in [1:toInt(arg("n","1"))] {
+ file data <"data.txt">;
+ out[j] = cat(data);
+}
Added: SwiftApps/swiftrun-demo/partial-site-definition/data.txt
===================================================================
--- SwiftApps/swiftrun-demo/partial-site-definition/data.txt (rev 0)
+++ SwiftApps/swiftrun-demo/partial-site-definition/data.txt 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1 @@
+fjdlksafjlsd
Added: SwiftApps/swiftrun-demo/partial-site-definition/swift.properties
===================================================================
--- SwiftApps/swiftrun-demo/partial-site-definition/swift.properties (rev 0)
+++ SwiftApps/swiftrun-demo/partial-site-definition/swift.properties 2013-10-13 05:01:30 UTC (rev 7154)
@@ -0,0 +1,2 @@
+site.sandyb.maxWalltime=00:05:00
+app.*.cat=/bin/cat
Deleted: SwiftApps/swiftrun-demo/swift.properties
===================================================================
--- SwiftApps/swiftrun-demo/swift.properties 2013-10-13 01:42:09 UTC (rev 7153)
+++ SwiftApps/swiftrun-demo/swift.properties 2013-10-13 05:01:30 UTC (rev 7154)
@@ -1,24 +0,0 @@
-site.sandyb.provider=local:slurm
-site.sandyb.jobspernode=16
-site.sandyb.maxWalltime=00:05:00
-site.sandyb.queue=sandyb
-site.sandyb.initialScore=10000
-site.sandyb.filesystem=local
-site.sandyb.workdirectory=/scratch/midway/$USER/work
-
-site.westmere {
- provider=local:slurm
- jobsPerNode=12
- maxWalltime=00:05:00
- queue=westmere
- initialScore=10000
- filesystem=local
- workdirectory=/scratch/midway/$USER/work
-}
-
-app.sandyb.echo=/bin/echo
-app.westmere.echo=/bin/echo
-app.*.cat=/bin/cat
-
-sitedir.keep=true
-wrapperlog.always.transfer=true
More information about the Swift-commit
mailing list