[Swift-commit] r6972 - in SwiftTutorials/raven: . part04 part05 part06

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Fri Aug 23 11:50:54 CDT 2013


Author: davidk
Date: 2013-08-23 11:50:54 -0500 (Fri, 23 Aug 2013)
New Revision: 6972

Added:
   SwiftTutorials/raven/setup.sh
Removed:
   SwiftTutorials/raven/part04/sites.xml
   SwiftTutorials/raven/part05/sites.xml
   SwiftTutorials/raven/part06/sites.xml
Log:
Add setup.sh


Deleted: SwiftTutorials/raven/part04/sites.xml
===================================================================
--- SwiftTutorials/raven/part04/sites.xml	2013-08-23 16:41:05 UTC (rev 6971)
+++ SwiftTutorials/raven/part04/sites.xml	2013-08-23 16:50:54 UTC (rev 6972)
@@ -1,18 +0,0 @@
-<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="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="nodeGranularity">2</profile>
-    <profile namespace="globus" key="maxNodes">2</profile>
-    <profile namespace="karajan" key="jobThrottle">60.99</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>{env.HOME}/swiftwork</workdirectory>
-  </pool>
-</config>

Deleted: SwiftTutorials/raven/part05/sites.xml
===================================================================
--- SwiftTutorials/raven/part05/sites.xml	2013-08-23 16:41:05 UTC (rev 6971)
+++ SwiftTutorials/raven/part05/sites.xml	2013-08-23 16:50:54 UTC (rev 6972)
@@ -1,18 +0,0 @@
-<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="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="nodeGranularity">2</profile>
-    <profile namespace="globus" key="maxNodes">2</profile>
-    <profile namespace="karajan" key="jobThrottle">60.99</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>{env.HOME}/swiftwork</workdirectory>
-  </pool>
-</config>

Deleted: SwiftTutorials/raven/part06/sites.xml
===================================================================
--- SwiftTutorials/raven/part06/sites.xml	2013-08-23 16:41:05 UTC (rev 6971)
+++ SwiftTutorials/raven/part06/sites.xml	2013-08-23 16:50:54 UTC (rev 6972)
@@ -1,18 +0,0 @@
-<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="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="nodeGranularity">2</profile>
-    <profile namespace="globus" key="maxNodes">2</profile>
-    <profile namespace="karajan" key="jobThrottle">60.99</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>{env.HOME}/swiftwork</workdirectory>
-  </pool>
-</config>

Added: SwiftTutorials/raven/setup.sh
===================================================================
--- SwiftTutorials/raven/setup.sh	                        (rev 0)
+++ SwiftTutorials/raven/setup.sh	2013-08-23 16:50:54 UTC (rev 6972)
@@ -0,0 +1,96 @@
+# ensure that this script is being sourced
+
+if [ ${BASH_VERSINFO[0]} -gt 2 -a "${BASH_SOURCE[0]}" = "${0}" ] ; then
+  echo ERROR: script ${BASH_SOURCE[0]} must be executed as: source ${BASH_SOURCE[0]}
+  exit 1
+fi
+
+# Add swift to PATH
+
+TUTSWIFT=/home/users/p01537/swift-0.94.1-RC2
+PATHSWIFT=$(which swift 2>/dev/null)
+
+if [ _$PATHSWIFT = _$TUTSWIFT/bin/swift ]; then
+  echo using Swift from $TUTSWIFT,already in PATH
+elif [ -x $TUTSWIFT/bin/swift ]; then
+  echo Using Swift from $TUTSWIFT, and adding to PATH
+  PATH=$TUTSWIFT/bin:$PATH
+elif [ _$PATHSWIFT != _ ]; then
+  echo Using $PATHSWIFT from PATH
+else
+  echo ERROR: $TUTSWIFT not found and no swift in PATH. Tutorial will not function.
+  return
+fi
+
+echo Swift version is $(swift -version)
+rm -f swift.log
+
+# Setting scripts folder to the PATH env var.
+
+TUTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if [ _$(which cleanup 2>/dev/null) != _$TUTDIR/bin/cleanup ]; then
+  echo Adding $TUTDIR/bin:$TUTDIR/app: to front of PATH
+  PATH=$TUTDIR/bin:$TUTDIR/app:$PATH
+else
+  echo Assuming $TUTDIR/bin:$TUTDIR/app: is already at front of PATH
+fi
+
+# Setting .swift files
+
+if [ -e $HOME/.swift/swift.properties ]; then
+  saveprop=$(mktemp $HOME/.swift/swift.properties.XXXX)
+  echo Saving $HOME/.swift/swift.properties in $saveprop
+  mv $HOME/.swift/swift.properties $saveprop
+else
+  mkdir -p $HOME/.swift
+fi
+
+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
+
+execution.retries=0
+lazy.errors=false
+
+use.wrapper.staging=false
+use.provider.staging=true
+provider.staging.pin.swiftfiles=false
+
+END
+
+cat >sites.raven<<END
+<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="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="nodeGranularity">2</profile>
+    <profile namespace="globus" key="maxNodes">2</profile>
+    <profile namespace="karajan" key="jobThrottle">60.99</profile>
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <filesystem provider="local"/>
+    <workdirectory>{env.HOME}/swiftwork</workdirectory>
+  </pool>
+</config>
+END
+
+for p in 04 05 06; do
+  cp sites.raven part${p}/sites.xml
+done
+
+return
+




More information about the Swift-commit mailing list