[Swift-commit] r7358 - in SwiftTutorials/swift-midway-tutorial: app doc

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Mon Dec 2 14:10:46 CST 2013


Author: davidk
Date: 2013-12-02 14:10:46 -0600 (Mon, 02 Dec 2013)
New Revision: 7358

Modified:
   SwiftTutorials/swift-midway-tutorial/app/simulate
   SwiftTutorials/swift-midway-tutorial/doc/README
Log:
Some doc corrections/updates


Modified: SwiftTutorials/swift-midway-tutorial/app/simulate
===================================================================
--- SwiftTutorials/swift-midway-tutorial/app/simulate	2013-12-02 19:38:48 UTC (rev 7357)
+++ SwiftTutorials/swift-midway-tutorial/app/simulate	2013-12-02 20:10:46 UTC (rev 7358)
@@ -54,7 +54,7 @@
 
 usage()
 {
-  echo $0: usage:
+  echo $( basename $0 ): usage:
   cat <<END
     -b|--bias       offset bias: add this integer to all results
     -B|--biasfile   file of integer biases to add to results

Modified: SwiftTutorials/swift-midway-tutorial/doc/README
===================================================================
--- SwiftTutorials/swift-midway-tutorial/doc/README	2013-12-02 19:38:48 UTC (rev 7357)
+++ SwiftTutorials/swift-midway-tutorial/doc/README	2013-12-02 20:10:46 UTC (rev 7358)
@@ -69,11 +69,10 @@
 Verify your environment
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-To verify that Swift (and the Java environment it requires) are working, do:
+To verify that Swift loaded, do:
 
 -----
-$ java -version   # verify that you have Java (ideally Oracle JAVA 1.6 or later)
-$ swift -version  # verify that you have Swift 0.94.1
+$ swift -version  # verify that you have Swift 0.95 RC1
 -----
 
 NOTE: If you re-login or open new ssh sessions, you must re-run `source setup.sh` in each ssh shell/window.
@@ -109,22 +108,21 @@
 by its command line arguments, which are:
 
 -----
-$ ./app/simulate --help
-./app/simulate: usage:
-    -b|--bias       offset bias: add this integer to all results [0]
-    -B|--biasfile   file of integer biases to add to results [none]
-    -l|--log        generate a log in stderr if not null [y]
-    -n|--nvalues    print this many values per simulation [1]
-    -r|--range      range (limit) of generated results [100]
-    -s|--seed       use this integer [0..32767] as a seed [none]
-    -S|--seedfile   use this file (containing integer seeds [0..32767]) one per line [none]
-    -t|--timesteps  number of simulated "timesteps" in seconds (determines runtime) [1]
-    -x|--scale      scale the results by this integer [1]
+$ simulate -help
+simulate: usage:
+    -b|--bias       offset bias: add this integer to all results
+    -B|--biasfile   file of integer biases to add to results
+    -l|--log        generate a log in stderr if not null
+    -n|--nvalues    print this many values per simulation            
+    -r|--range      range (limit) of generated results
+    -s|--seed       use this integer [0..32767] as a seed
+    -S|--seedfile   use this file (containing integer seeds [0..32767]) one per line
+    -t|--timesteps  number of simulated "timesteps" in seconds (determines runtime)
+    -x|--scale      scale the results by this integer
     -h|-?|?|--help  print this help
-$
 -----
 
-All of thess arguments are optional, with default values indicated above as `[n]`.
+All of these arguments are optional, with default values indicated above as `[n]`.
 
 ////
 .simulation arguments
@@ -147,12 +145,12 @@
 
 -----
 $ simulate 2>log
-       5
-$ head -4 log
+      51
+$ head -5 log
 
-Called as: /home/wilde/swift/tut/CIC_2013-08-09/app/simulate:
-Start time: Thu Aug 22 12:40:24 CDT 2013
-Running on node: login01.osgconnect.net
+Called as: /home/davidkelly999/swift-midway-tutorial/app/simulate: 
+Start time: Mon Dec  2 13:47:41 CST 2013
+Running as user: uid=88848(davidkelly999) gid=88848(davidkelly999) groups=88848(davidkelly999),10008(rcc),10030(pi-gavoth),10031(sp-swift),10036(swift),10058(pi-joshuaelliott),10084(pi-wilde),10118(cron-account),10124(cmts),10138(cmtsworkshop)
 
 $ simulate -n 4 -r 1000000 2>log
   239454
@@ -552,20 +550,22 @@
 over time, and `cumulativeplot.png`, which shows the total number of
 app calls completed as the Swift script progresses.
 
-After each swift run, a log file will be created called
-partNN-<YYYYmmdd>-<hhmm>-<random>.log.  Once you have identified the
-log file name, run the command `./plot.sh` <logfile>` (where logfile
-is the most recent Swift run log) to generate the plots for that
+After each Swift run, a new run directory is created called runNNN.
+Each run directory will have a log file with a similar name called
+runNNN.log. Once you have identified the log file name, run the 
+command `plot.sh` <logfile>` to generate the plots for that
 specific run. For example:
 
 -----
-$ ls -lt *.log | head
--rw-r--r-- 1 p01532 61532 2237693 Aug 26 12:45 p4-20130826-1244-kmos0d87.log
--rw-r--r-- 1 p01532 61532    1008 Aug 26 12:44 swift.log
--rw-r--r-- 1 p01532 61532 5345345 Aug 26 12:44 p4-20130826-1243-10u2qdbd.log
--rw-r--r-- 1 p01532 61532  357687 Aug 26 12:00 p4-20130826-1159-j01p4lu0.log
-...
-$ plot.sh p4-20130826-1244-kmos0d87.log
+$ ls
+output  p3.swift  run000  swift.properties
+
+$ cd run000/
+
+$ ls
+apps  cf  p3-20131202-2004-0kh4ha6e.d  run000.log  sites.xml
+
+$ plot.sh run000.log 
 -----
 
 This yields plots like:
@@ -573,11 +573,6 @@
 image::activeplot.png[width=700,align=center]
 image::cumulativeplot.png[width=700,align=center]
 
-NOTE: Because systems like Raven are often firewalled, you may need to
-use scp to pull these image files back to a system on which you can
-view them with a browser or preview tool.
-
-
 Part 5: Controlling the compute-node pools where applications run
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -605,8 +600,8 @@
 -----
 and on the bias file, computed and then consumed in these two dependent statements:
 -----
-  biasfile = genbias(1000, 20, simulate_script);
-  (simout,simlog) = simulation(steps, range, biasfile, 1000000, values, simulate_script, seedfile);
+  biasfile = genbias(1000, 20);
+  (simout,simlog) = simulation(steps, range, biasfile, 1000000, values, seedfile);
 -----
 
 To run:




More information about the Swift-commit mailing list