[Swift-commit] r7542 - SwiftApps/swift-galaxy/swift
ketan at ci.uchicago.edu
ketan at ci.uchicago.edu
Sat Feb 1 16:10:15 CST 2014
Author: ketan
Date: 2014-02-01 16:10:15 -0600 (Sat, 01 Feb 2014)
New Revision: 7542
Modified:
SwiftApps/swift-galaxy/swift/buildsite.sh
SwiftApps/swift-galaxy/swift/genericswift.sh
SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
SwiftApps/swift-galaxy/swift/swiftforeachrange.sh
Log:
fix basedir
Modified: SwiftApps/swift-galaxy/swift/buildsite.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/buildsite.sh 2014-02-01 21:34:43 UTC (rev 7541)
+++ SwiftApps/swift-galaxy/swift/buildsite.sh 2014-02-01 22:10:15 UTC (rev 7542)
@@ -8,7 +8,6 @@
# defaults to localhost of none of the above provided
-
echo $@ > /tmp/args.txt
# numeric range
site=$1
Modified: SwiftApps/swift-galaxy/swift/genericswift.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/genericswift.sh 2014-02-01 21:34:43 UTC (rev 7541)
+++ SwiftApps/swift-galaxy/swift/genericswift.sh 2014-02-01 22:10:15 UTC (rev 7542)
@@ -32,7 +32,8 @@
ln -s $script script.swift
swift=$(which swift)
# use "here" document for configs
-./buildsite.sh $site
+BASEDIR=$(dirname $0)
+$BASEDIR/buildsite.sh $site
#build config
cat << EOF > /tmp/cf
Modified: SwiftApps/swift-galaxy/swift/swiftforeachlist.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachlist.sh 2014-02-01 21:34:43 UTC (rev 7541)
+++ SwiftApps/swift-galaxy/swift/swiftforeachlist.sh 2014-02-01 22:10:15 UTC (rev 7542)
@@ -40,121 +40,9 @@
swift=$(which swift)
-# use "here" document for configs
-case "$site" in
-midway )
-cat << EOF > /tmp/sites.xml
-<config>
- <pool handle="midway">
- <execution provider="coaster" url="swift.rcc.uchicago.edu" jobmanager="ssh-cl:slurm"/>
- <profile namespace="globus" key="queue">sandyb</profile>
- <profile namespace="globus" key="jobsPerNode">16</profile>
- <profile namespace="globus" key="maxWalltime">02:00:00</profile>
- <profile namespace="globus" key="maxTime">7500</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">2</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="karajan" key="jobThrottle">.31</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" />
- <workdirectory>/tmp/swift.work</workdirectory>
- </pool>
-</config>
-EOF
+BASEDIR=$(dirname $0)
+$BASEDIR/buildsite.sh $site
-;;
-
-uc3 )
-cat << EOF > /tmp/sites.xml
-<config>
- <pool handle="uc3">
- <execution provider="coaster" url="uc3-sub.uchicago.edu" jobmanager="ssh-cl:condor"/>
- <!--<execution provider="coaster" jobmanager="local:condor"/>-->
- <profile namespace="karajan" key="jobThrottle">.09</profile>
- <profile namespace="karajan" key="initialScore">1000</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="maxWalltime">3600</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="condor.Requirements">UidDomain == "osg-gk.mwt2.org"</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="condor.+AccountingGroup">"group_friends.{env.USER}"</profile>
- <profile namespace="globus" key="jobType">nonshared</profile>
- <filesystem provider="local" />
- <!--<workdirectory>/home/maheshwari/test/catsn/swift.work</workdirectory>-->
- <workdirectory>/tmp/swift.work</workdirectory>
- </pool>
-</config>
-EOF
-
-;;
-
-stampede )
-cat << EOF > /tmp/sites.xml
-<config>
-<pool handle="stampede">
- <execution provider="coaster" jobmanager="ssh-cl:slurm" url="stampede.tacc.utexas.edu"/>
- <filesystem provider="local"/>
- <profile namespace="globus" key="jobsPerNode">16</profile>
- <profile namespace="globus" key="ppn">16</profile>
- <profile namespace="globus" key="project">TG-STA110005S</profile>
- <profile namespace="globus" key="queue">normal</profile>
- <profile namespace="globus" key="slurm.mail-user">ketancmaheshwari at gmail.com</profile>
- <profile namespace="globus" key="slurm.mail-type">ALL</profile>
- <profile namespace="globus" key="maxWalltime">02:00:00</profile>
- <profile namespace="globus" key="maxTime">8000</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="karajan" key="jobThrottle">.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <workdirectory>/tmp/swift.work</workdirectory>
-</pool>
-</config>
-EOF
-
-;;
-
-localhost )
-cat << EOF > /tmp/sites.xml
-<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
-<pool handle="localhost">
- <execution provider="local" />
- <profile namespace="karajan" key="jobThrottle">0.07</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>/tmp/swift.work</workdirectory>
- <profile namespace="swift" key="stagingMethod">local</profile>
-</pool>
-</config>
-EOF
-
-;;
-
-* )
-echo "defaulting to localhost"
-cat << EOF > /tmp/sites.xml
-<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
-<pool handle="localhost">
- <execution provider="local" />
- <profile namespace="karajan" key="jobThrottle">0.07</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>/tmp/swift.work</workdirectory>
- <profile namespace="swift" key="stagingMethod">local</profile>
-</pool>
-</config>
-EOF
-
-;;
-esac
-
cat << EOF > /tmp/cf
use.provider.staging=false
wrapperlog.always.transfer=true
Modified: SwiftApps/swift-galaxy/swift/swiftforeachrange.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachrange.sh 2014-02-01 21:34:43 UTC (rev 7541)
+++ SwiftApps/swift-galaxy/swift/swiftforeachrange.sh 2014-02-01 22:10:15 UTC (rev 7542)
@@ -7,7 +7,6 @@
#3. Add a type such that only binaries and executable scripts are populated in the executable list.
#
-echo $@ > /tmp/args.txt
# numeric range
site=$1
shift
@@ -43,7 +42,9 @@
swift=$(which swift)
#build site
-./buildsite.sh $site
+echo $PWD > /tmp/pwd.txt
+BASEDIR=$(dirname $0)
+$BASEDIR/buildsite.sh $site
#build config
cat << EOF > /tmp/cf
More information about the Swift-commit
mailing list