[Swift-commit] r6996 - in SwiftTutorials/swift-cray-tutorial: . doc

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-08-24 20:27:36 -0500 (Sat, 24 Aug 2013)
New Revision: 6996

Modified:
   SwiftTutorials/swift-cray-tutorial/doc/README
   SwiftTutorials/swift-cray-tutorial/doc/asciidoc.css
   SwiftTutorials/swift-cray-tutorial/doc/push.sh
   SwiftTutorials/swift-cray-tutorial/setup.sh
Log:
Updated docs and setup for cray.

Modified: SwiftTutorials/swift-cray-tutorial/doc/README
===================================================================
--- SwiftTutorials/swift-cray-tutorial/doc/README	2013-08-25 00:38:53 UTC (rev 6995)
+++ SwiftTutorials/swift-cray-tutorial/doc/README	2013-08-25 01:27:36 UTC (rev 6996)
@@ -55,8 +55,8 @@
 
 -----
 $ cd $HOME
-$ tar xfz /home/users/p01537/swift-cray-tutorial.tar.gz
-$ cd cray-swift
+$ tar xzf /home/users/p01532/swift-cray-tutorial.tgz
+$ cd swift-cray-tutorial
 $ source setup.sh   # You must run this with "source" !
 -----
 

Modified: SwiftTutorials/swift-cray-tutorial/doc/asciidoc.css
===================================================================
--- SwiftTutorials/swift-cray-tutorial/doc/asciidoc.css	2013-08-25 00:38:53 UTC (rev 6995)
+++ SwiftTutorials/swift-cray-tutorial/doc/asciidoc.css	2013-08-25 01:27:36 UTC (rev 6996)
@@ -1,2 +1,26 @@
 a:link { color:navy; }
 a:visited { color:navy; }
+
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: small; /* inherit; */
+  color: navy;
+  padding: 0;
+  margin: 0;
+}
+
+/*
+  background: #f8f8f8;
+  border: 1px solid #dddddd;
+  border-left: 5px solid #f0f0f0;
+  margin-right: 10%;
+*/
+
+div.listingblock > div.content {
+  padding: 0.5em;
+  background: none;
+  border: none;
+  border-left: none;
+  margin-right: none;
+}
+

Modified: SwiftTutorials/swift-cray-tutorial/doc/push.sh
===================================================================
--- SwiftTutorials/swift-cray-tutorial/doc/push.sh	2013-08-25 00:38:53 UTC (rev 6995)
+++ SwiftTutorials/swift-cray-tutorial/doc/push.sh	2013-08-25 01:27:36 UTC (rev 6996)
@@ -1,12 +1,3 @@
 #! /bin/sh
 
 scp swift-cray-tutorial.html *png login.ci.uchicago.edu:/ci/www/projects/swift/tutorials/cray
-
-exit
-
-www=/ci/www/projects/swift/ATPESC
-
-cp --backup=numbered tutorial.html $www
-cp --backup=numbered *.png $www
-chmod g+w,a+r $www/tutorial.html $www/*png
-ls -l $www

Modified: SwiftTutorials/swift-cray-tutorial/setup.sh
===================================================================
--- SwiftTutorials/swift-cray-tutorial/setup.sh	2013-08-25 00:38:53 UTC (rev 6995)
+++ SwiftTutorials/swift-cray-tutorial/setup.sh	2013-08-25 01:27:36 UTC (rev 6996)
@@ -5,6 +5,10 @@
   exit 1
 fi
 
+# Add Sun Java
+
+module load java
+
 # Add swift to PATH
 
 TUTSWIFT=/home/users/p01537/swift-0.94.1-RC2
@@ -71,15 +75,13 @@
 <config>
   <pool handle="raven">
     <execution provider="coaster" jobmanager="local:pbs"/>
-    <profile namespace="globus" key="project">CI-SES000031</profile>
-    <!--<profile namespace="globus" key="ppn">24:cray:pack</profile>-->
     <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
-    <profile namespace="globus" key="jobsPerNode">24</profile>
+    <profile namespace="globus" key="jobsPerNode">16</profile>
     <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
     <profile namespace="globus" key="maxWallTime">00:01:00</profile>
     <profile namespace="globus" key="slots">1</profile>
     <profile namespace="globus" key="maxNodes">2</profile>
-    <profile namespace="karajan" key="jobThrottle">60.99</profile>
+    <profile namespace="karajan" key="jobThrottle">5.00</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local"/>
     <workdirectory>{env.HOME}/swiftwork</workdirectory>
@@ -91,5 +93,7 @@
   cp sites.raven part${p}/sites.xml
 done
 
+rm sites.raven
+
 return