[Swift-commit] r6473 - in demo/cray/swift-1.0: . part08

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-04-18 11:13:50 -0500 (Thu, 18 Apr 2013)
New Revision: 6473

Modified:
   demo/cray/swift-1.0/part08/cf
   demo/cray/swift-1.0/part08/cf.ps
   demo/cray/swift-1.0/setup.sh
Log:
Update setup process.

Modified: demo/cray/swift-1.0/part08/cf
===================================================================
--- demo/cray/swift-1.0/part08/cf	2013-04-18 06:35:29 UTC (rev 6472)
+++ demo/cray/swift-1.0/part08/cf	2013-04-18 16:13:50 UTC (rev 6473)
@@ -1,11 +1,7 @@
-#sites.file=${swift.home}/etc/sites.xml
-#tc.file=${swift.home}/etc/tc.data
 
 sites.file=./raven.xml
 tc.file=./apps
 
-#user.home=/lustre/beagle/wilde
-
 wrapperlog.always.transfer=true
 sitedir.keep=true
 execution.retries=0

Modified: demo/cray/swift-1.0/part08/cf.ps
===================================================================
--- demo/cray/swift-1.0/part08/cf.ps	2013-04-18 06:35:29 UTC (rev 6472)
+++ demo/cray/swift-1.0/part08/cf.ps	2013-04-18 16:13:50 UTC (rev 6473)
@@ -1,4 +1,7 @@
-#user.home=/lustre/beagle/wilde
+
+sites.file=./raven.xml
+tc.file=./apps
+
 wrapperlog.always.transfer=true
 sitedir.keep=true
 execution.retries=0

Modified: demo/cray/swift-1.0/setup.sh
===================================================================
--- demo/cray/swift-1.0/setup.sh	2013-04-18 06:35:29 UTC (rev 6472)
+++ demo/cray/swift-1.0/setup.sh	2013-04-18 16:13:50 UTC (rev 6473)
@@ -1,38 +1,41 @@
 
-# module load java # to get Oracle/Sun JDK
+module load java # to get Oracle/Sun JDK
 # module load swift
 
-
-# export SBATCH_RESERVATION=swift
-
 export PATHPREFIX="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../bin" && pwd )"
-echo   Set PATHPREFIX=$PATHPREFIX
+echo   Setting PATHPREFIX=$PATHPREFIX
 
 PATH=/home/users/p01532/swift/rev/0.94/bin:$PATHPREFIX:$PATH
+echo   Setting PATH=$PATH
 
-return
-
 mkdir -p $HOME/.swift
 
-
 if [ -f $HOME/.swift/swift.properties ]; then
   echo Adding properties to end of $HOME/.swift/swift.properties
 else
   echo creating $HOME/.swift/swift.properties
 fi
 
+mkdir -p $HOME/.swift
 cat >>$HOME/.swift/swift.properties <<END
 
 # Properties for Swift Tutorial 
 
+sites.file=./sites.xml
+tc.file=./apps
+
+wrapperlog.always.transfer=true
+sitedir.keep=true
+file.gc.enabled=false
 status.mode=provider
-use.provider.staging=false
-use.wrapper.staging=false
-wrapperlog.always.transfer=true
+
 execution.retries=0
 lazy.errors=false
+
+use.wrapper.staging=false
 provider.staging.pin.swiftfiles=false
-sitedir.keep=true
-file.gc.enabled=false
-tcp.port.range=50000,51000
+
+# Edit this line to change data management mode:
+use.provider.staging=false
+
 END