[Swift-commit] r7298 - in SwiftApps/swiftrun-demo: . 01-full-site-definition 02-partial-site-definition

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-11-18 16:06:36 -0600 (Mon, 18 Nov 2013)
New Revision: 7298

Added:
   SwiftApps/swiftrun-demo/01-full-site-definition/
   SwiftApps/swiftrun-demo/02-partial-site-definition/
Removed:
   SwiftApps/swiftrun-demo/full-site-definition/
   SwiftApps/swiftrun-demo/partial-site-definition/
Modified:
   SwiftApps/swiftrun-demo/01-full-site-definition/README
   SwiftApps/swiftrun-demo/01-full-site-definition/catsn.swift
   SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties
   SwiftApps/swiftrun-demo/02-partial-site-definition/README
   SwiftApps/swiftrun-demo/02-partial-site-definition/catsn.swift
Log:
Some updates to the documentation, renaming


Modified: SwiftApps/swiftrun-demo/01-full-site-definition/README
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/README	2013-11-18 20:58:53 UTC (rev 7297)
+++ SwiftApps/swiftrun-demo/01-full-site-definition/README	2013-11-18 22:06:36 UTC (rev 7298)
@@ -22,3 +22,15 @@
    workdirectory=/scratch/midway/$USER/work
 }
 
+To display information about the configuration files being used
+
+$ swift -listconfig
+
+To run on a single site:
+
+$ swift -site sandyb catsn.swift
+
+To run on multiple sites:
+
+$ swift -sites sandyb,westmere catsn.swift
+

Modified: SwiftApps/swiftrun-demo/01-full-site-definition/catsn.swift
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/catsn.swift	2013-11-18 20:58:53 UTC (rev 7297)
+++ SwiftApps/swiftrun-demo/01-full-site-definition/catsn.swift	2013-11-18 22:06:36 UTC (rev 7298)
@@ -7,7 +7,7 @@
 
 file out[]<simple_mapper; location="output", prefix="catsn.",suffix=".out">;
 
-foreach j in [1:toInt(arg("n","1"))] {
+foreach j in [1:toInt(arg("n","100"))] {
   file data <"data.txt">;
   out[j] = cat(data);
 }

Modified: SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties
===================================================================
--- SwiftApps/swiftrun-demo/full-site-definition/swift.properties	2013-11-18 20:58:53 UTC (rev 7297)
+++ SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties	2013-11-18 22:06:36 UTC (rev 7298)
@@ -1,18 +1,20 @@
-site.sandyb.provider=local:slurm
+site.sandyb.filesystem=local
+site.sandyb.initialScore=10000
 site.sandyb.jobspernode=16
 site.sandyb.maxWalltime=00:05:00
+site.sandyb.provider=local:slurm
 site.sandyb.queue=sandyb
-site.sandyb.initialScore=10000
-site.sandyb.filesystem=local
+site.sandyb.slots=1
 site.sandyb.workdirectory=/scratch/midway/$USER/work
 
 site.westmere {
-   provider=local:slurm
+   filesystem=local
+   initialScore=10000
    jobsPerNode=12
    maxWalltime=00:05:00
+   provider=local:slurm
    queue=westmere
-   initialScore=10000
-   filesystem=local
+   slots=1
    workdirectory=/scratch/midway/$USER/work
 }
 

Modified: SwiftApps/swiftrun-demo/02-partial-site-definition/README
===================================================================
--- SwiftApps/swiftrun-demo/partial-site-definition/README	2013-11-18 20:58:53 UTC (rev 7297)
+++ SwiftApps/swiftrun-demo/02-partial-site-definition/README	2013-11-18 22:06:36 UTC (rev 7298)
@@ -2,7 +2,7 @@
 
 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
+partitions on midway. When you run swift, the SWIFT_SITE_CONF environment variable is read
 and added to your swift.properties path search.
 
 The search path is:
@@ -19,5 +19,5 @@
 
 To run:
 
-nswift -sites sandyb,westmere catsn.swift
+swift -sites sandyb,westmere catsn.swift
 

Modified: SwiftApps/swiftrun-demo/02-partial-site-definition/catsn.swift
===================================================================
--- SwiftApps/swiftrun-demo/partial-site-definition/catsn.swift	2013-11-18 20:58:53 UTC (rev 7297)
+++ SwiftApps/swiftrun-demo/02-partial-site-definition/catsn.swift	2013-11-18 22:06:36 UTC (rev 7298)
@@ -7,7 +7,7 @@
 
 file out[]<simple_mapper; location="output", prefix="catsn.",suffix=".out">;
 
-foreach j in [1:toInt(arg("n","1"))] {
+foreach j in [1:toInt(arg("n","100"))] {
   file data <"data.txt">;
   out[j] = cat(data);
 }