[Swift-commit] r4121 - in branches/release-0.92: bin etc/sites
noreply at svn.ci.uchicago.edu
noreply at svn.ci.uchicago.edu
Fri Feb 18 23:48:29 CST 2011
Author: davidk
Date: 2011-02-18 23:48:29 -0600 (Fri, 18 Feb 2011)
New Revision: 4121
Added:
branches/release-0.92/etc/sites/intrepid
branches/release-0.92/etc/sites/local
branches/release-0.92/etc/sites/local-pbs-coasters
branches/release-0.92/etc/sites/pads
branches/release-0.92/etc/sites/queenbee
branches/release-0.92/etc/sites/sge-local
branches/release-0.92/etc/sites/ssh
branches/release-0.92/etc/sites/ssh-pbs-coasters
branches/release-0.92/etc/sites/surveyor
Removed:
branches/release-0.92/etc/sites/local-pbs-coasters.xml
Modified:
branches/release-0.92/bin/gensites
Log:
Gensites updates: now uses pbs style directives in swift.properties, ability to use a default value across all templates, various other fixes
Added templates from test suite
Modified: branches/release-0.92/bin/gensites
===================================================================
--- branches/release-0.92/bin/gensites 2011-02-19 04:31:50 UTC (rev 4120)
+++ branches/release-0.92/bin/gensites 2011-02-19 05:48:29 UTC (rev 4121)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# crash: Report a problem and exit
crash()
@@ -13,7 +13,7 @@
# will return bar
get_value()
{
- echo $1 |cut -d "=" -f2
+ echo $2 |cut -d "=" -f2
}
# Verify an argument is not null
@@ -74,12 +74,8 @@
if [ -z "$SWIFT_HOME" ]; then
SWIFT_BIN_DIR=`which swift`
- # From SVN
- SWIFT_HOME=`dirname $SWIFT_BIN_DIR`"/../../../etc/sites"
-
- # From a distribution
if [ ! -d "$SWIFT_HOME" ]; then
- SWIFT_HOME=`dirname $SWIFT_BIN_DIR`"../../etc/sites"
+ SWIFT_HOME=`dirname $SWIFT_BIN_DIR`"/../etc/sites"
fi
# Can't find swift path, give up
@@ -90,8 +86,16 @@
# List templates
if [ ! -z "$LIST_TEMPLATES" ]; then
- ls -1 $SWIFT_HOME/* | xargs -n1 basename
- ls -1 $HOME/.swift/sites/* | xargs -n1 basename
+ # Templates in etc/sites
+ for file in `ls -1 $SWIFT_HOME/*`
+ do
+ basename $file
+ done
+ # Templates in .swift/sites
+ for file in `ls -1 $HOME/.swift/sites/*`
+ do
+ basename $file
+ done
exit 0
fi
@@ -133,25 +137,25 @@
while read line
do
case "$line" in
- $TEMPLATE".work="*)
+ \#$TEMPLATE" work="*|'#gensites work='*)
WORK=`get_value $line`
;;
- $TEMPLATE".globus_hostname="*)
+ \#$TEMPLATE" globus_hostname="*|'#gensites globus_hostname=')
GLOBUS_HOSTNAME=`get_value $line`
;;
- $TEMPLATE".nodes="*)
+ \#$TEMPLATE" nodes="*|'#gensites nodes='*)
NODES=`get_value $line`
;;
- $TEMPLATE".project="*)
+ \#$TEMPLATE" project="*|'#gensites project='*)
PROJECT=`get_value $line`
;;
- $TEMPLATE".queue="*)
+ \#$TEMPLATE" queue="*|'#gensites queue='*)
QUEUE=`get_value $line`
;;
- $TEMPLATE".n_gran="*)
+ \#$TEMPLATE" n_gran="*|'#gensites n_gran='*)
N_GRAN=`get_value $line`
;;
- $TEMPLATE".n_max="*)
+ \#$TEMPLATE" n_max="*|'#gensites n_max='*)
MAXTIME=`get_value $line`
;;
esac
@@ -167,7 +171,6 @@
then
if ! declare -p ${TOKEN} > /dev/null
then
- printenv
crash "Not specified: ${TOKEN}"
fi
fi
Added: branches/release-0.92/etc/sites/intrepid
===================================================================
--- branches/release-0.92/etc/sites/intrepid (rev 0)
+++ branches/release-0.92/etc/sites/intrepid 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,32 @@
+<config>
+
+ <pool handle="localhost" sysinfo="INTEL32::LINUX">
+ <gridftp url="local://localhost" />
+ <execution provider="local" url="none" />
+ <workdirectory>_WORK_</workdirectory>
+ <!-- <profile namespace="karajan" key="maxSubmitRate">1</profile> -->
+ <profile namespace="karajan" key="jobThrottle">0.04</profile>
+ <profile namespace="swift" key="stagingMethod">file</profile>
+ </pool>
+
+ <pool handle="coasters_alcfbgp">
+ <filesystem provider="local" />
+ <execution provider="coaster" jobmanager="local:cobalt"/>
+ <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
+ <profile namespace="globus" key="internalHostname">_HOST_</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <profile namespace="globus" key="queue">_QUEUE_</profile>
+ <profile namespace="globus" key="kernelprofile">zeptoos</profile>
+ <profile namespace="globus" key="alcfbgpnat">true</profile>
+ <profile namespace="karajan" key="jobthrottle">21</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="workersPerNode">1</profile>
+ <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
+ <profile namespace="globus" key="nodeGranularity">64</profile>
+ <profile namespace="globus" key="maxNodes">64</profile>
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+
+</config>
Added: branches/release-0.92/etc/sites/local
===================================================================
--- branches/release-0.92/etc/sites/local (rev 0)
+++ branches/release-0.92/etc/sites/local 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,9 @@
+<config>
+<pool handle="local">
+ <execution provider="local" />
+ <gridftp url="local://localhost" />
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile key="jobThrottle" namespace="karajan">.31</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Copied: branches/release-0.92/etc/sites/local-pbs-coasters (from rev 4120, branches/release-0.92/etc/sites/local-pbs-coasters.xml)
===================================================================
--- branches/release-0.92/etc/sites/local-pbs-coasters (rev 0)
+++ branches/release-0.92/etc/sites/local-pbs-coasters 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,17 @@
+<config>
+<pool handle="local-pbs-coasters">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <filesystem provider="local" url="none" />
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+ <profile key="workersPerNode" namespace="globus">1</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">1</profile>
+ <profile key="queue" namespace="globus">_QUEUE_</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Deleted: branches/release-0.92/etc/sites/local-pbs-coasters.xml
===================================================================
--- branches/release-0.92/etc/sites/local-pbs-coasters.xml 2011-02-19 04:31:50 UTC (rev 4120)
+++ branches/release-0.92/etc/sites/local-pbs-coasters.xml 2011-02-19 05:48:29 UTC (rev 4121)
@@ -1,17 +0,0 @@
-<config>
-<pool handle="local-pbs-coasters">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <filesystem provider="local" url="none" />
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
- <profile key="workersPerNode" namespace="globus">1</profile>
- <profile key="slots" namespace="globus">1</profile>
- <profile key="nodeGranularity" namespace="globus">1</profile>
- <profile key="maxNodes" namespace="globus">1</profile>
- <profile key="queue" namespace="globus">_QUEUE_</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <workdirectory>_WORK_</workdirectory>
-</pool>
-</config>
Added: branches/release-0.92/etc/sites/pads
===================================================================
--- branches/release-0.92/etc/sites/pads (rev 0)
+++ branches/release-0.92/etc/sites/pads 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,8 @@
+<config>
+<pool handle="pads-pbs">
+ <execution jobmanager="local:pbs" provider="local" url="none" />
+ <filesystem provider="local" url="none" />
+ <profile key="jobThrottle" namespace="karajan">0</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Added: branches/release-0.92/etc/sites/queenbee
===================================================================
--- branches/release-0.92/etc/sites/queenbee (rev 0)
+++ branches/release-0.92/etc/sites/queenbee 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,8 @@
+<config>
+<pool handle="queenbee-pbs">
+ <execution jobmanager="local:pbs" provider="local" url="none" />
+ <filesystem provider="local" url="none" />
+ <profile key="jobThrottle" namespace="karajan">0</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Added: branches/release-0.92/etc/sites/sge-local
===================================================================
--- branches/release-0.92/etc/sites/sge-local (rev 0)
+++ branches/release-0.92/etc/sites/sge-local 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,10 @@
+<config>
+<pool handle="sge-local">
+ <execution provider="sge" url="none" />
+ <profile namespace="globus" key="pe">threaded</profile>
+ <profile key="jobThrottle" namespace="karajan">.49</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local" url="none" />
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+</config>
Added: branches/release-0.92/etc/sites/ssh
===================================================================
--- branches/release-0.92/etc/sites/ssh (rev 0)
+++ branches/release-0.92/etc/sites/ssh 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,8 @@
+<config>
+<pool handle="ssh">
+ <execution provider="ssh" url="login1.pads.ci.uchicago.edu" />
+ <filesystem provider="ssh" url="login1.pads.ci.uchicago.edu" />
+ <profile key="jobThrottle" namespace="karajan">0</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Added: branches/release-0.92/etc/sites/ssh-pbs-coasters
===================================================================
--- branches/release-0.92/etc/sites/ssh-pbs-coasters (rev 0)
+++ branches/release-0.92/etc/sites/ssh-pbs-coasters 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,15 @@
+<config>
+<pool handle="ssh-pbs-coasters">
+ <execution jobmanager="ssh:pbs" provider="coaster" url="login1.pads.ci.uchicago.edu" />
+ <filesystem provider="ssh" url="login1.pads.ci.uchicago.edu" />
+ <profile key="maxtime" namespace="globus">3000</profile>
+ <profile key="workersPerNode" namespace="globus">8</profile>
+ <profile key="slots" namespace="globus">1</profile>
+ <profile key="nodeGranularity" namespace="globus">1</profile>
+ <profile key="maxNodes" namespace="globus">10</profile>
+ <profile key="queue" namespace="globus">short</profile>
+ <profile key="jobThrottle" namespace="karajan">0.5</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <workdirectory>_WORK_</workdirectory>
+</pool>
+</config>
Added: branches/release-0.92/etc/sites/surveyor
===================================================================
--- branches/release-0.92/etc/sites/surveyor (rev 0)
+++ branches/release-0.92/etc/sites/surveyor 2011-02-19 05:48:29 UTC (rev 4121)
@@ -0,0 +1,22 @@
+<config>
+ <pool handle="surveyor">
+ <filesystem provider="local" />
+ <execution provider="coaster" jobmanager="local:cobalt"/>
+ <!-- <profile namespace="swift" key="stagingMethod">local</profile> -->
+ <profile namespace="globus" key="internalHostname">_HOST_</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <profile namespace="globus" key="queue">_QUEUE_</profile>
+ <profile namespace="globus" key="kernelprofile">zeptoos</profile>
+ <profile namespace="globus" key="alcfbgpnat">true</profile>
+ <profile namespace="karajan" key="jobthrottle">21</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <profile namespace="globus" key="workersPerNode">1</profile>
+ <profile namespace="globus" key="workerLoggingLevel">DEBUG</profile>
+ <profile namespace="globus" key="slots">1</profile>
+ <profile namespace="globus" key="maxTime">900</profile> <!-- seconds -->
+ <profile namespace="globus" key="nodeGranularity">64</profile>
+ <profile namespace="globus" key="maxNodes">64</profile>
+ <workdirectory>_WORK_</workdirectory>
+ </pool>
+</config>
+
More information about the Swift-commit
mailing list