[Swift-commit] r4542 - SwiftApps/SwiftR/Swift/exec
tga at ci.uchicago.edu
tga at ci.uchicago.edu
Wed Jun 1 15:01:00 CDT 2011
Author: tga
Date: 2011-06-01 15:01:00 -0500 (Wed, 01 Jun 2011)
New Revision: 4542
Modified:
SwiftApps/SwiftR/Swift/exec/configure-server-cobalt
SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
SwiftApps/SwiftR/Swift/exec/configure-server-local
SwiftApps/SwiftR/Swift/exec/configure-server-pbs
SwiftApps/SwiftR/Swift/exec/configure-server-sge
SwiftApps/SwiftR/Swift/exec/configure-server-ssh
Log:
Removed obselete cruft from configuration files
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-cobalt
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-01 19:56:02 UTC (rev 4541)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-cobalt 2011-06-01 20:01:00 UTC (rev 4542)
@@ -6,22 +6,12 @@
throttle=$2
cat >tc <<END
-fork bashlocal /bin/bash null null GLOBUS::maxwalltime="00:00:10"
cobalt bash /bin/bash null null ENV::PATH="$PATH";GLOBUS::maxwalltime="00:01:00"
END
cat >sites.xml <<END
<config>
-
- <pool handle="fork">
- <execution provider="local" url="none" />
- <profile key="jobThrottle" namespace="karajan">0.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>$(pwd)/swiftwork</workdirectory>
- </pool>
-
<pool handle="cobalt">
<execution provider="coaster" url="none" jobmanager="local:NA"/>
<profile namespace="globus" key="workerManager">passive</profile>
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxt 2011-06-01 19:56:02 UTC (rev 4541)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxt 2011-06-01 20:01:00 UTC (rev 4542)
@@ -6,7 +6,6 @@
throttlePBS=$2
cat >tc <<END
-fork bashlocal /bin/bash null null null
pbs bash /bin/bash null null ENV::PATH="$PATH";GLOBUS::maxwalltime="00:01:00"
END
@@ -18,15 +17,6 @@
cat >sites.xml <<END
<config>
-
- <pool handle="fork">
- <execution provider="local" url="none" />
- <profile key="jobThrottle" namespace="karajan">0.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>$(pwd)/swiftwork</workdirectory>
- </pool>
-
<pool handle="pbs">
<execution provider="coaster" url="none" jobmanager="local:NA"/>
<profile namespace="globus" key="workerManager">passive</profile>
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-local
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-06-01 19:56:02 UTC (rev 4541)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-local 2011-06-01 20:01:00 UTC (rev 4542)
@@ -55,8 +55,6 @@
done
-# <profile namespace="karajan" key="jobsPerCpu">1</profile>
-
echo '</config>' >>sites.xml
cat >cf <<END
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-pbs
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-pbs 2011-06-01 19:56:02 UTC (rev 4541)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-pbs 2011-06-01 20:01:00 UTC (rev 4542)
@@ -7,7 +7,6 @@
throttlePBS=$2
cat >tc <<END
-fork bashlocal /bin/bash null null null
pbs bash /bin/bash null null ENV::PATH="$PATH";GLOBUS::maxwalltime="00:01:00"
END
@@ -16,16 +15,6 @@
cat >sites.xml <<END
<config>
-
- <pool handle="fork">
- <execution provider="local" url="none" />
- <profile key="jobThrottle" namespace="karajan">0.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <profile namespace="env" key="R_LIBS_USER">$R_LIBS_USER</profile>
- <workdirectory>$(pwd)/swiftwork</workdirectory>
- </pool>
-
<pool handle="pbs">
<execution provider="coaster" url="none" jobmanager="local:NA"/>
<profile namespace="globus" key="workerManager">passive</profile>
@@ -52,34 +41,3 @@
#throttle.host.submit=1
END
-
-: SAVE FOR REFERENCE <<END
-
-# <profile namespace="globus" key="maxWallTime">00:00:01</profile>
-# <profile namespace="globus" key="queue">fast</profile>
-
- <pool handle="pbsdirect">
- <execution provider="pbs" url="none" />
- <profile namespace="globus" key="queue">fast</profile>
- <profile namespace="globus" key="maxwalltime">00:59:00</profile>
- <profile key="jobThrottle" namespace="karajan">$throttlePBS</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>$HOME/swiftwork</workdirectory>
- </pool>
-
- <pool handle="pbscoast">
- <execution provider="coaster" url="none" jobmanager="local:pbs"/>
- <profile namespace="globus" key="queue">short</profile>
- <profile namespace="globus" key="maxTime">12000</profile>
- <profile namespace="globus" key="slots">32</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="workersPerNode">1</profile>
- <profile namespace="karajan" key="jobThrottle">2.55</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none"/>
- <workdirectory>$HOME/swiftwork</workdirectory>
- </pool>
-
-END
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-sge
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-06-01 19:56:02 UTC (rev 4541)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-sge 2011-06-01 20:01:00 UTC (rev 4542)
@@ -6,7 +6,6 @@
throttle=$2
cat >tc <<END
-fork bashlocal /bin/bash null null GLOBUS::maxwalltime="00:00:10"
sge bash /bin/bash null null ENV::PATH="$PATH";GLOBUS::maxwalltime="00:01:00"
END
@@ -15,16 +14,6 @@
cat >sites.xml <<END
<config>
- <pool handle="fork">
- <execution provider="local" url="none"/>
- <profile key="jobThrottle" namespace="karajan">0.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <profile namespace="env" key="R_LIBS_USER">$R_LIBS_USER</profile>
- <workdirectory>$(pwd)/swiftwork</workdirectory>
- <profile namespace="swift" key="stagingMethod">file</profile>
- </pool>
-
<pool handle="sge">
<execution provider="coaster" url="none" jobmanager="local:NA"/>
<profile namespace="globus" key="workerManager">passive</profile>
@@ -54,32 +43,3 @@
#throttle.host.submit=1
END
-: SAVE FOR REFERENCE <<END
-
- <pool handle="fork">
- <execution provider="coaster" url="none" jobmanager="local:local"/>
- <profile namespace="globus" key="maxtime">300000</profile>
- <profile namespace="globus" key="workersPerNode">4</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxnodes">1</profile>
- <profile key="jobThrottle" namespace="karajan">0.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>$(pwd)/swiftwork</workdirectory>
- <profile namespace="swift" key="stagingMethod">proxy</profile>
- </pool>
-
- <pool handle="localhost">
- <!-- <execution provider="coaster-persistent" url="http://bridled.ci.uchicago.edu:" jobmanager="local:local"/> -->
- <execution provider="coaster" url="none" jobmanager="local:local"/>
- <!-- <profile namespace="globus" key="workerManager">passive</profile> -->
- <profile namespace="globus" key="workersPerNode">8</profile>
- <profile namespace="globus" key="slots">1</profile>
- <profile namespace="globus" key="maxnodes">1</profile>
- <profile key="jobThrottle" namespace="karajan">.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="swift" key="stagingMethod">proxy</profile>
- <workdirectory>/scratch/local/wilde/pstest/swiftwork</workdirectory>
- </pool>
-
-END
Modified: SwiftApps/SwiftR/Swift/exec/configure-server-ssh
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-ssh 2011-06-01 19:56:02 UTC (rev 4541)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-ssh 2011-06-01 20:01:00 UTC (rev 4542)
@@ -6,21 +6,11 @@
cat >tc <<END
-fork bashlocal /bin/bash null null null
sshcoast bash /bin/bash null null ENV::PATH="$PATH";GLOBUS::maxwalltime="$time"
END
cat >sites.xml <<END
<config>
- <pool handle="fork">
- <execution provider="local" url="none" />
- <profile key="jobThrottle" namespace="karajan">0.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="env" key="R_LIBS_USER">$R_LIBS_USER</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>$(pwd)/swiftwork</workdirectory>
- </pool>
-
<pool handle="sshcoast">
<execution provider="coaster" url="none" jobmanager="local:NA"/>
<profile namespace="globus" key="workerManager">passive</profile>
@@ -46,19 +36,3 @@
#throttle.host.submit=1
END
-true to save <<END
-
-# <profile namespace="globus" key="maxWallTime">00:00:01</profile>
-# <profile namespace="globus" key="queue">fast</profile>
-
- <pool handle="persistent-coasters-model">
- <!-- <execution provider="coaster-persistent" url="http://$(hostname -f):${SERVICEPORT}" jobmanager="local:local"/> -->
- <execution provider="coaster" jobmanager="local:local"/>
- <profile namespace="globus" key="workerManager">passive</profile>
- <profile namespace="globus" key="workersPerNode">4</profile>
- <profile key="jobThrottle" namespace="karajan">.03</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local" url="none" />
- <workdirectory>$HOME/swiftwork</workdirectory>
- </pool>
-END
More information about the Swift-commit
mailing list