[Swift-commit] r7604 - SwiftApps/swift-galaxy/swift
ketan at ci.uchicago.edu
ketan at ci.uchicago.edu
Mon Feb 17 14:00:49 CST 2014
Author: ketan
Date: 2014-02-17 14:00:49 -0600 (Mon, 17 Feb 2014)
New Revision: 7604
Added:
SwiftApps/swift-galaxy/swift/swiftforeachtest.sh
Modified:
SwiftApps/swift-galaxy/swift/swiftforeach.xml
SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
Log:
adding test dir
Modified: SwiftApps/swift-galaxy/swift/swiftforeach.xml
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.xml 2014-02-17 19:43:49 UTC (rev 7603)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.xml 2014-02-17 20:00:49 UTC (rev 7604)
@@ -13,41 +13,64 @@
<command interpreter="bash">
#if $rangeorlist.rl == "rng"
- swiftforeachrange.sh
- $site
- $interpret
- $exec
- $rangeorlist.rngstart
- $rangeorlist.rend
- $rangeorlist.stepsize
- $outloc
- $logfile
- $outlist
- #for $a in $stringarg
- ${a.stringargname}
- #end for
- #for $a in $filearg
- ${a.fileargname}
- #end for
+ swiftforeachrange.sh
+ $site
+ $interpret
+ $exec
+ $rangeorlist.rngstart
+ $rangeorlist.rend
+ $rangeorlist.stepsize
+ $outloc
+ $logfile
+ $outlist
+ #for $a in $stringarg
+ ${a.stringargname}
+ #end for
+ #for $a in $filearg
+ ${a.fileargname}
+ #end for
+ #elif $rangeorlist.rl == "lst"
+ swiftforeachlist.sh
+ $site
+ $interpret
+ $exec
+ $rangeorlist.listfile
+ $outloc
+ $logfile
+ $outlist
+ #for $a in $stringarg
+ ${a.stringargname}
+ #end for
+ #for $a in $filearg
+ ${a.fileargname}
+ #end for
#else
- swiftforeachlist.sh
- $site
- $interpret
- $exec
- $rangeorlist.listfile
- $outloc
- $logfile
- $outlist
- #for $a in $stringarg
- ${a.stringargname}
- #end for
- #for $a in $filearg
- ${a.fileargname}
- #end for
+ swiftforeachtest.sh
+ $site
+ $interpret
+ $exec
+ $rangeorlist.rngstart
+ $rangeorlist.rend
+ $rangeorlist.stepsize
+ $rangeorlist.listfile
+ $outloc
+ $logfile
+ $outlist
+ #for $a in $stringarg
+ ${a.stringargname}
+ #end for
+ #for $a in $filearg
+ ${a.fileargname}
+ #end for
#end if
-
</command>
-
+ <!--
+ #if $swiftargs.mode == "advanced"
+ #for $sa in $swiftarg
+ ${sa.swiftargname}
+ #end for
+ #end if
+ -->
<inputs>
<param name="site" type="select" multiple="true" label="Execution Location" help="Multi-select list - hold the appropriate key while clicking to select multiple items">
<option value="localhost">Localhost</option>
@@ -72,6 +95,7 @@
<param name="rl" type="select" label="Select range or list">
<option value="rng">numeric range</option>
<option value="lst">items list</option>
+ <option value="tst">dry test</option>
</param>
<when value="rng">
@@ -98,26 +122,17 @@
<sanitizer sanitize="False" />
</param>
- <conditional name="configuration">
- <param name="mode" type="select" label="Swift configuration">
- <option value="default">default configuration</option>
- <option value="advanced">advanced configuration</option>
+ <conditional name="swiftargs">
+ <param name="mode" type="select" label="Swift commandline arguments">
+ <option value="default">no additional arguments (default)</option>
+ <option value="advanced">add commandline arguments</option>
</param>
-
<when value="default">
</when>
<when value="advanced">
- <param name="remoteurl" size="50" type="text" value="midway.swift.rcc.uchicago.edu" label="remote url" help="remote resource to run jobs on"></param>
- <param name="throttle" size="5" type="float" value="0.07" label="job throttle" help="number of parallel jobs to run"></param>
- <param name="project" type="text" value="TG-STA110005S" label="Project allocation" help="name/code of project"></param>
- <param name="slots" size="5" type="integer" value="1" label="slots" help="number of scheduler jobs"></param>
- <param name="queue" size="5" type="text" value="normal" label="queue" help="queue to run jobs on"></param>
- <param name="nodes" size="5" type="integer" value="1" label="nodes" help="number of nodes requested"></param>
- <param name="nodegranularity" size="5" type="integer" value="1" label="node granularity" help="node granularity"></param>
- <param name="jobspernode" size="5" type="integer" value="8" label="jobs per node" help="number of jobs per node requested"></param>
- <param name="ppn" size="5" type="integer" value="8" label="ppn" help="processes per node requested"></param>
- <param name="walltime" size="5" type="text" value="00:10:00" label="Job walltime" help="time in hh:mm:ss to request to scheduler for this job"></param>
- <param name="maxtime" size="5" type="integer" value="700" label="application maxtime" help="Application maxtime in seconds for this job"></param>
+ <repeat name="swiftarg" title="swiftarg">
+ <param name="swiftargname" type="text" label="swiftarg" />
+ </repeat>
</when>
</conditional>
</inputs>
Modified: SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachlist.sh 2014-02-17 19:43:49 UTC (rev 7603)
+++ SwiftApps/swift-galaxy/swift/swiftforeachlist.sh 2014-02-17 20:00:49 UTC (rev 7604)
@@ -34,7 +34,7 @@
fileargs=()
while [ $# -gt 0 ] ; do
- fileargs+=("\"$1\"")
+ fileargs+=("\"$1\"")
shift
done
@@ -91,7 +91,7 @@
$swift -sites.file $wdir/sites.xml -tc.file $wdir/tc -config $wdir/cf $wdir/script.swift 2>$logfile
EXITCODE=$?
-#`for i in \`find $HOME/swift-sandbox -type f\`; do echo "\`basename $i\` $i"; done`
+`for i in \`find $HOME/swift-sandbox -type f\`; do echo "\`basename $i\` $i"; done`
cat << EOF > $outlistfile
`for i in $(find $outloc -type f -iname "*.out"); do echo "$i"; done`
EOF
Added: SwiftApps/swift-galaxy/swift/swiftforeachtest.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachtest.sh (rev 0)
+++ SwiftApps/swift-galaxy/swift/swiftforeachtest.sh 2014-02-17 20:00:49 UTC (rev 7604)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo $@ > /tmp/args.txt
Property changes on: SwiftApps/swift-galaxy/swift/swiftforeachtest.sh
___________________________________________________________________
Added: svn:executable
+ *
More information about the Swift-commit
mailing list