[Swift-commit] r5574 - in SwiftApps/SciColSim: . conf conf/TODO
wilde at ci.uchicago.edu
wilde at ci.uchicago.edu
Thu Feb 9 17:50:44 CST 2012
Author: wilde
Date: 2012-02-09 17:50:44 -0600 (Thu, 09 Feb 2012)
New Revision: 5574
Added:
SwiftApps/SciColSim/conf/TODO/
SwiftApps/SciColSim/conf/TODO/basiclocal.xml
SwiftApps/SciColSim/conf/TODO/beagle.xml
SwiftApps/SciColSim/conf/TODO/local.xml
SwiftApps/SciColSim/conf/TODO/pads.similar.beagle.xml
SwiftApps/SciColSim/conf/TODO/sites.beagle.quick.xml
SwiftApps/SciColSim/conf/TODO/sites.beagle.xml
SwiftApps/SciColSim/conf/gen.cf
SwiftApps/SciColSim/conf/gen.local
SwiftApps/SciColSim/conf/gen.pads
SwiftApps/SciColSim/conf/gen.tc
Removed:
SwiftApps/SciColSim/conf/basiclocal.xml
SwiftApps/SciColSim/conf/beagle.xml
SwiftApps/SciColSim/conf/cf
SwiftApps/SciColSim/conf/local.xml
SwiftApps/SciColSim/conf/pads.similar.beagle.xml
SwiftApps/SciColSim/conf/sites.beagle.quick.xml
SwiftApps/SciColSim/conf/sites.beagle.xml
SwiftApps/SciColSim/conf/tc
Modified:
SwiftApps/SciColSim/swiftopt.sh
Log:
initial mods for new swiftopt.sh command - main end user command to run Swift optimizer.
Copied: SwiftApps/SciColSim/conf/TODO/basiclocal.xml (from rev 5572, SwiftApps/SciColSim/conf/basiclocal.xml)
===================================================================
--- SwiftApps/SciColSim/conf/TODO/basiclocal.xml (rev 0)
+++ SwiftApps/SciColSim/conf/TODO/basiclocal.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,10 @@
+<config>
+
+ <pool handle="localhost">
+ <execution provider="local" url="none" />
+ <filesystem provider="local"/>
+ <workdirectory>/home/wilde/swift/lab/swiftwork</workdirectory>
+ <profile namespace="karajan" key="jobThrottle">0</profile>
+ </pool>
+
+</config>
Copied: SwiftApps/SciColSim/conf/TODO/beagle.xml (from rev 5572, SwiftApps/SciColSim/conf/beagle.xml)
===================================================================
--- SwiftApps/SciColSim/conf/TODO/beagle.xml (rev 0)
+++ SwiftApps/SciColSim/conf/TODO/beagle.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,60 @@
+<config>
+
+<!-- From Glen: used w/ "Swift svn swift-r4813 (swift modified locally) cog-r3175" -->
+
+ <pool handle="beagle">
+
+ <execution provider="coaster" jobmanager="local:pbs" url="none"/>
+ <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
+ <profile key="jobsPerNode" namespace="globus">1</profile>
+
+ <profile namespace="env" key="OMP_NUM_THREADS">24</profile>
+ <profile namespace="globus" key="maxwalltime">02:00:00</profile>
+ <profile namespace="globus" key="maxTime">14400</profile>
+ <profile namespace="globus" key="slots">20</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">1</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="karajan" key="jobThrottle">.15</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+
+ <profile namespace="globus" key="project">CI-MCB000119</profile>
+ <profile namespace="globus" key="queue">route</profile>
+
+ <filesystem provider="local"/>
+ <workdirectory >/lustre/beagle/wilde/swiftwork</workdirectory>
+ </pool>
+
+<!-- From Justin's swift-devel page:
+
+<import file="sys.xml"/>
+<set name="wdir" value="/lustre/beagle/{user.name}/work"/>
+<echo message="setting workDirectory to: {wdir}"/>
+
+
+<pool handle="beagle-pbs">
+ <execution jobmanager="local:pbs" provider="coaster" url="none"/>
+ <profile namespace="globus" key="maxWallTime">1</profile>
+ <profile namespace="globus" key="maxTime">7200</profile>
+
+ <profile namespace="globus" key="providerAttributes">
+ pbs.aprun;pbs.mpp;depth=24
+ </profile>
+ <profile key="jobsPerNode" namespace="globus">24</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">batch</profile>
+ <profile key="jobThrottle" namespace="karajan">5.99</profile>
+ <profile key="initialScore" namespace="karajan">10000</profile>
+ <profile namespace="globus" key="project">_PROJECT_</profile>
+ <profile namespace="globus" key="project">_QUEUE_</profile>
+
+ <filesystem provider="local" url="none" />
+ <workdirectory>{wdir}</workdirectory>
+</pool>
+
+-->
+
+</config>
Copied: SwiftApps/SciColSim/conf/TODO/local.xml (from rev 5572, SwiftApps/SciColSim/conf/local.xml)
===================================================================
--- SwiftApps/SciColSim/conf/TODO/local.xml (rev 0)
+++ SwiftApps/SciColSim/conf/TODO/local.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,9 @@
+<config>
+ <pool handle="localhost" >
+ <execution provider="local" url="none" />
+ <profile namespace="karajan" key="jobThrottle">0.05</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local"/>
+ <workdirectory>$(pwd)/swiftwork</workdirectory>
+ </pool>
+</config>
Copied: SwiftApps/SciColSim/conf/TODO/pads.similar.beagle.xml (from rev 5572, SwiftApps/SciColSim/conf/pads.similar.beagle.xml)
===================================================================
--- SwiftApps/SciColSim/conf/TODO/pads.similar.beagle.xml (rev 0)
+++ SwiftApps/SciColSim/conf/TODO/pads.similar.beagle.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,23 @@
+<config>
+ <pool handle="pads">
+ <execution provider="coaster" jobmanager="ssh:pbs" url="login.pads.ci.uchicago.edu" />
+ <filesystem provider="local"/>
+
+ <profile namespace="globus" key="project">CI-CCR000013</profile>
+ <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
+
+ <profile namespace="globus" key="ppn">8</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="globus" key="maxTime">3600</profile>
+ <profile namespace="globus" key="maxWallTime">00:02:00</profile>
+ <profile namespace="globus" key="slots">10</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">1</profile>
+ <profile namespace="globus" key="queue">fast</profile>
+ <profile namespace="karajan" key="jobThrottle">9.59</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <workdirectory>/gpfs/pads/swift/jonmon/Swift/work/pads</workdirectory>
+ </pool>
+</config>
Copied: SwiftApps/SciColSim/conf/TODO/sites.beagle.quick.xml (from rev 5572, SwiftApps/SciColSim/conf/sites.beagle.quick.xml)
===================================================================
--- SwiftApps/SciColSim/conf/TODO/sites.beagle.quick.xml (rev 0)
+++ SwiftApps/SciColSim/conf/TODO/sites.beagle.quick.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,24 @@
+<config>
+ <pool handle="beagle">
+ <execution provider="coaster" jobmanager="local:pbs"/>
+ <profile namespace="globus" key="project">CI-MCB000119</profile>
+
+ <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
+
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="env" key="OMP_NUM_THREADS">24</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
+ <profile namespace="globus" key="maxTime">10000</profile>
+ <profile namespace="globus" key="maxWallTime">01:30:00</profile>
+ <profile namespace="globus" key="slots">50</profile>
+ <profile namespace="globus" key="nodeGranularity">2</profile>
+ <profile namespace="globus" key="maxNodes">2</profile>
+ <profile namespace="globus" key="queue">route</profile>
+ <profile namespace="karajan" key="jobThrottle">9.59</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local"/>
+ <workdirectory >/lustre/beagle/ketan/labs/SciColSim-Bgl/swift.workdir</workdirectory>
+ </pool>
+</config>
Copied: SwiftApps/SciColSim/conf/TODO/sites.beagle.xml (from rev 5572, SwiftApps/SciColSim/conf/sites.beagle.xml)
===================================================================
--- SwiftApps/SciColSim/conf/TODO/sites.beagle.xml (rev 0)
+++ SwiftApps/SciColSim/conf/TODO/sites.beagle.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,23 @@
+<config>
+ <pool handle="beagle">
+ <execution provider="coaster" jobmanager="local:pbs"/>
+ <profile namespace="globus" key="project">CI-MCB000119</profile>
+
+ <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
+ <!--<profile namespace="globus" key="jobsPerNode">24</profile>-->
+ <profile namespace="env" key="OMP_NUM_THREADS">24</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
+ <profile namespace="globus" key="maxTime">37000</profile>
+ <profile namespace="globus" key="maxWallTime">10:00:00</profile>
+ <profile namespace="globus" key="slots">20</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="globus" key="nodeGranularity">2</profile>
+ <profile namespace="globus" key="maxNodes">2</profile>
+ <profile namespace="karajan" key="jobThrottle">9.59</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local"/>
+ <workdirectory >/lustre/beagle/ketan/labs/SciColSim-Bgl/swift.workdir</workdirectory>
+ </pool>
+</config>
Deleted: SwiftApps/SciColSim/conf/basiclocal.xml
===================================================================
--- SwiftApps/SciColSim/conf/basiclocal.xml 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/basiclocal.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,10 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <execution provider="local" url="none" />
- <filesystem provider="local"/>
- <workdirectory>/home/wilde/swift/lab/swiftwork</workdirectory>
- <profile namespace="karajan" key="jobThrottle">0</profile>
- </pool>
-
-</config>
Deleted: SwiftApps/SciColSim/conf/beagle.xml
===================================================================
--- SwiftApps/SciColSim/conf/beagle.xml 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/beagle.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,60 +0,0 @@
-<config>
-
-<!-- From Glen: used w/ "Swift svn swift-r4813 (swift modified locally) cog-r3175" -->
-
- <pool handle="beagle">
-
- <execution provider="coaster" jobmanager="local:pbs" url="none"/>
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
- <profile key="jobsPerNode" namespace="globus">1</profile>
-
- <profile namespace="env" key="OMP_NUM_THREADS">24</profile>
- <profile namespace="globus" key="maxwalltime">02:00:00</profile>
- <profile namespace="globus" key="maxTime">14400</profile>
- <profile namespace="globus" key="slots">20</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="karajan" key="jobThrottle">.15</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
-
- <profile namespace="globus" key="project">CI-MCB000119</profile>
- <profile namespace="globus" key="queue">route</profile>
-
- <filesystem provider="local"/>
- <workdirectory >/lustre/beagle/wilde/swiftwork</workdirectory>
- </pool>
-
-<!-- From Justin's swift-devel page:
-
-<import file="sys.xml"/>
-<set name="wdir" value="/lustre/beagle/{user.name}/work"/>
-<echo message="setting workDirectory to: {wdir}"/>
-
-
-<pool handle="beagle-pbs">
- <execution jobmanager="local:pbs" provider="coaster" url="none"/>
- <profile namespace="globus" key="maxWallTime">1</profile>
- <profile namespace="globus" key="maxTime">7200</profile>
-
- <profile namespace="globus" key="providerAttributes">
- pbs.aprun;pbs.mpp;depth=24
- </profile>
- <profile key="jobsPerNode" namespace="globus">24</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">batch</profile>
- <profile key="jobThrottle" namespace="karajan">5.99</profile>
- <profile key="initialScore" namespace="karajan">10000</profile>
- <profile namespace="globus" key="project">_PROJECT_</profile>
- <profile namespace="globus" key="project">_QUEUE_</profile>
-
- <filesystem provider="local" url="none" />
- <workdirectory>{wdir}</workdirectory>
-</pool>
-
--->
-
-</config>
Deleted: SwiftApps/SciColSim/conf/cf
===================================================================
--- SwiftApps/SciColSim/conf/cf 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/cf 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,7 +0,0 @@
-wrapperlog.always.transfer=true
-sitedir.keep=true
-execution.retries=3
-lazy.errors=true
-status.mode=provider
-use.provider.staging=false
-provider.staging.pin.swiftfiles=false
Copied: SwiftApps/SciColSim/conf/gen.cf (from rev 5572, SwiftApps/SciColSim/conf/cf)
===================================================================
--- SwiftApps/SciColSim/conf/gen.cf (rev 0)
+++ SwiftApps/SciColSim/conf/gen.cf 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,9 @@
+cat <<END
+wrapperlog.always.transfer=true
+sitedir.keep=true
+execution.retries=3
+lazy.errors=true
+status.mode=provider
+use.provider.staging=false
+provider.staging.pin.swiftfiles=false
+END
Added: SwiftApps/SciColSim/conf/gen.local
===================================================================
--- SwiftApps/SciColSim/conf/gen.local (rev 0)
+++ SwiftApps/SciColSim/conf/gen.local 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# FIXME: Set throttle etc with gensites param (ideally based on # local cpus?)
+
+cat <<END
+<config>
+ <pool handle="local" >
+ <execution provider="local" url="none" />
+ <profile namespace="karajan" key="jobThrottle">0.05</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+ <filesystem provider="local"/>
+ <workdirectory>$(pwd)/swiftwork/local</workdirectory>
+ </pool>
+</config>
+END
\ No newline at end of file
Property changes on: SwiftApps/SciColSim/conf/gen.local
___________________________________________________________________
Added: svn:executable
+ *
Added: SwiftApps/SciColSim/conf/gen.pads
===================================================================
--- SwiftApps/SciColSim/conf/gen.pads (rev 0)
+++ SwiftApps/SciColSim/conf/gen.pads 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+# FIXME: Substitute using gensites: PROJECT MAXTIME SLOTS CLUSTER_THROTTLE etc
+
+cat <<END
+
+<config>
+
+ <pool handle="local" >
+
+ <execution provider="local" url="none" />
+ <profile namespace="karajan" key="jobThrottle">0.01</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+
+ <filesystem provider="local"/>
+ <workdirectory>$(pwd)/swiftwork/local</workdirectory>
+
+ </pool>
+
+ <pool handle="pads">
+
+ <execution provider="coaster" jobmanager="ssh:pbs" url="login.pads.ci.uchicago.edu" />
+ <profile namespace="globus" key="project">CI-CCR000013</profile>
+ <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
+ <profile namespace="globus" key="ppn">8</profile>
+ <profile namespace="globus" key="jobsPerNode">1</profile>
+ <profile namespace="globus" key="lowOverAllocation">100</profile>
+ <profile namespace="globus" key="highOverAllocation">100</profile>
+ <profile namespace="globus" key="maxTime">3600</profile>
+ <profile namespace="globus" key="maxWallTime">00:02:00</profile>
+ <profile namespace="globus" key="slots">10</profile>
+ <profile namespace="globus" key="nodeGranularity">1</profile>
+ <profile namespace="globus" key="maxNodes">1</profile>
+ <profile namespace="globus" key="queue">fast</profile>
+ <profile namespace="karajan" key="jobThrottle">9.59</profile>
+ <profile namespace="karajan" key="initialScore">10000</profile>
+
+ <filesystem provider="local"/>
+ <workdirectory>$(pwd)/swiftwork/pads</workdirectory>
+
+ </pool>
+
+</config>
+
+END
Property changes on: SwiftApps/SciColSim/conf/gen.pads
___________________________________________________________________
Added: svn:executable
+ *
Copied: SwiftApps/SciColSim/conf/gen.tc (from rev 5572, SwiftApps/SciColSim/conf/tc)
===================================================================
--- SwiftApps/SciColSim/conf/gen.tc (rev 0)
+++ SwiftApps/SciColSim/conf/gen.tc 2012-02-09 23:50:44 UTC (rev 5574)
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+site=$1
+
+cat <<END
+$site evolve $(pwd)/evolve.sh null null GLOBUS::maxwalltime="00:10:00"
+local sumloss $(pwd)/sumloss.sh null null null
+END
Deleted: SwiftApps/SciColSim/conf/local.xml
===================================================================
--- SwiftApps/SciColSim/conf/local.xml 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/local.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,9 +0,0 @@
-<config>
- <pool handle="localhost" >
- <execution provider="local" url="none" />
- <profile namespace="karajan" key="jobThrottle">0.05</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>/gpfs/pads/swift/jonmon/Swift/work/pads</workdirectory>
- </pool>
-</config>
Deleted: SwiftApps/SciColSim/conf/pads.similar.beagle.xml
===================================================================
--- SwiftApps/SciColSim/conf/pads.similar.beagle.xml 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/pads.similar.beagle.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,23 +0,0 @@
-<config>
- <pool handle="pads">
- <execution provider="coaster" jobmanager="ssh:pbs" url="login.pads.ci.uchicago.edu" />
- <filesystem provider="local"/>
-
- <profile namespace="globus" key="project">CI-CCR000013</profile>
- <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
-
- <profile namespace="globus" key="ppn">8</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="maxTime">3600</profile>
- <profile namespace="globus" key="maxWallTime">00:02:00</profile>
- <profile namespace="globus" key="slots">10</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">1</profile>
- <profile namespace="globus" key="queue">fast</profile>
- <profile namespace="karajan" key="jobThrottle">9.59</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <workdirectory>/gpfs/pads/swift/jonmon/Swift/work/pads</workdirectory>
- </pool>
-</config>
Deleted: SwiftApps/SciColSim/conf/sites.beagle.quick.xml
===================================================================
--- SwiftApps/SciColSim/conf/sites.beagle.quick.xml 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/sites.beagle.quick.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,24 +0,0 @@
-<config>
- <pool handle="beagle">
- <execution provider="coaster" jobmanager="local:pbs"/>
- <profile namespace="globus" key="project">CI-MCB000119</profile>
-
- <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
-
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="env" key="OMP_NUM_THREADS">24</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
- <profile namespace="globus" key="maxTime">10000</profile>
- <profile namespace="globus" key="maxWallTime">01:30:00</profile>
- <profile namespace="globus" key="slots">50</profile>
- <profile namespace="globus" key="nodeGranularity">2</profile>
- <profile namespace="globus" key="maxNodes">2</profile>
- <profile namespace="globus" key="queue">route</profile>
- <profile namespace="karajan" key="jobThrottle">9.59</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory >/lustre/beagle/ketan/labs/SciColSim-Bgl/swift.workdir</workdirectory>
- </pool>
-</config>
Deleted: SwiftApps/SciColSim/conf/sites.beagle.xml
===================================================================
--- SwiftApps/SciColSim/conf/sites.beagle.xml 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/sites.beagle.xml 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,23 +0,0 @@
-<config>
- <pool handle="beagle">
- <execution provider="coaster" jobmanager="local:pbs"/>
- <profile namespace="globus" key="project">CI-MCB000119</profile>
-
- <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
- <!--<profile namespace="globus" key="jobsPerNode">24</profile>-->
- <profile namespace="env" key="OMP_NUM_THREADS">24</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="providerAttributes">pbs.aprun;pbs.mpp;depth=24</profile>
- <profile namespace="globus" key="maxTime">37000</profile>
- <profile namespace="globus" key="maxWallTime">10:00:00</profile>
- <profile namespace="globus" key="slots">20</profile>
- <profile namespace="globus" key="lowOverAllocation">100</profile>
- <profile namespace="globus" key="highOverAllocation">100</profile>
- <profile namespace="globus" key="nodeGranularity">2</profile>
- <profile namespace="globus" key="maxNodes">2</profile>
- <profile namespace="karajan" key="jobThrottle">9.59</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory >/lustre/beagle/ketan/labs/SciColSim-Bgl/swift.workdir</workdirectory>
- </pool>
-</config>
Deleted: SwiftApps/SciColSim/conf/tc
===================================================================
--- SwiftApps/SciColSim/conf/tc 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/conf/tc 2012-02-09 23:50:44 UTC (rev 5574)
@@ -1,15 +0,0 @@
-localhost sh /bin/sh null null null
-localhost cat /bin/cat null null null
-
-pbs cat /bin/cat null null null
-mcs cat /bin/cat null null null
-localhost catnap /home/wilde/swift/lab/catnap.sh null null GLOBUS::maxwalltime="00:01:00"
-
-beagle optimizer /home/wilde/AndreysOptimizer/src/Optimizer null null null
-beagle optimizersh /home/wilde/AndreysOptimizer/src/optimizer.sh null null null
-
-beagle evolve /home/wilde/AndreysOptimizer/src/evolve.sh null null null
-localhost evolve /home/wilde/AndreysOptimizer/src/evolve.sh null null GLOBUS::maxwalltime="02:00:00"
-
-beagle sumloss /home/wilde/AndreysOptimizer/src/sumloss.sh null null null
-localhost sumloss /home/wilde/AndreysOptimizer/src/sumloss.sh null null GLOBUS::maxwalltime="02:00:00"
Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh 2012-02-09 22:50:15 UTC (rev 5573)
+++ SwiftApps/SciColSim/swiftopt.sh 2012-02-09 23:50:44 UTC (rev 5574)
@@ -47,7 +47,11 @@
echo Optimization run $runid: site=$execsite paramfile=$paramfile
-cp conf/{tc,cf,$execsite.xml} $rundir
+# generate swift config files # FIXME: replace this logic using gensites
+conf/gen.tc $execsite > $rundir/tc
+conf/gen.cf $execsite > $rundir/cf
+conf/gen.$execsite > $rundir/$execsite.xml
+
cp movie_graph.txt $rundir
# Echo parameters
@@ -69,7 +73,7 @@
cd $rundir
-SWIFT_HEAP_MAX=$ram $swift >& swift.out -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift $e33 \
+SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >& swift.out -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift $e33 \
\
-minrange=$min_target_innovation \
-maxrange=$max_target_innovation \
@@ -77,7 +81,7 @@
\
-nreps=$annealing_repeats \
-annealingcycles=$annealing_cycles \
--evoreruns=$evolve_reruns \
+-evolvereruns=$evolve_reruns \
\
-alphai=$alpha_i \
-alpham=$alpha_m \
More information about the Swift-commit
mailing list