[Swift-commit] r6184 - in SwiftApps/modis: . bin
davidk at ci.uchicago.edu
davidk at ci.uchicago.edu
Tue Jan 29 16:20:23 CST 2013
Author: davidk
Date: 2013-01-29 16:20:22 -0600 (Tue, 29 Jan 2013)
New Revision: 6184
Added:
SwiftApps/modis/bin/modis.mapper
Removed:
SwiftApps/modis/modis.mapper
SwiftApps/modis/sites.local.xml
SwiftApps/modis/sites.midway.xml
SwiftApps/modis/sites.pads.xml
SwiftApps/modis/sites.xml
SwiftApps/modis/tc.local
SwiftApps/modis/tc.midway
SwiftApps/modis/tc.pads
Log:
Remove more of the older sites.xml files, move mapper
Copied: SwiftApps/modis/bin/modis.mapper (from rev 6178, SwiftApps/modis/modis.mapper)
===================================================================
--- SwiftApps/modis/bin/modis.mapper (rev 0)
+++ SwiftApps/modis/bin/modis.mapper 2013-01-29 22:20:22 UTC (rev 6184)
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Usage: $0 -location dir -suffix .tif -site gsiftp://gridftp.pads.ci.uchicago.edu/ -n=999
+
+while [ $# -gt 0 ]; do
+ case $1 in
+ -location) location=$2;;
+ -suffix) suffix=$2;;
+ -site) site=$2;;
+ -n) n=$2;;
+ *) echo "$0: bad mapper args" 1>&2
+ exit 1;;
+ esac
+ shift 2
+done
+
+find $location -type f -name 'h??v??'${suffix} -print | head -$n |
+awk '{printf "[%d] %s\n", NR-1, $1}'
+
+
Deleted: SwiftApps/modis/modis.mapper
===================================================================
--- SwiftApps/modis/modis.mapper 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/modis.mapper 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Usage: $0 -location dir -suffix .tif -site gsiftp://gridftp.pads.ci.uchicago.edu/ -n=999
-
-while [ $# -gt 0 ]; do
- case $1 in
- -location) location=$2;;
- -suffix) suffix=$2;;
- -site) site=$2;;
- -n) n=$2;;
- *) echo "$0: bad mapper args" 1>&2
- exit 1;;
- esac
- shift 2
-done
-
-find $location -type f -name 'h??v??'${suffix} -print | head -$n |
-awk '{printf "[%d] %s\n", NR-1, $1}'
-
-
Deleted: SwiftApps/modis/sites.local.xml
===================================================================
--- SwiftApps/modis/sites.local.xml 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/sites.local.xml 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,11 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <execution provider="local" url="none"/>
- <profile namespace="karajan" key="jobThrottle">.31</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>{env.HOME}/swiftwork</workdirectory>
- </pool>
-
-</config>
Deleted: SwiftApps/modis/sites.midway.xml
===================================================================
--- SwiftApps/modis/sites.midway.xml 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/sites.midway.xml 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,31 +0,0 @@
-<config>
-
- <pool handle="midway-sandyb">
- <execution provider="coaster" jobmanager="local:slurm" url="none" />
- <filesystem provider="local" />
- <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
- <profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="jobsPerNode">16</profile>
- <profile namespace="globus" key="slots">10</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">25</profile>
- <profile namespace="globus" key="queue">sandyb</profile>
- <profile namespace="karajan" key="jobThrottle">1000</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- </pool>
-
- <pool handle="midway-westmere">
- <execution provider="coaster" jobmanager="local:slurm" url="none" />
- <filesystem provider="local" />
- <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
- <profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="jobsPerNode">12</profile>
- <profile namespace="globus" key="slots">20</profile>
- <profile namespace="globus" key="nodeGranularity">1</profile>
- <profile namespace="globus" key="maxNodes">25</profile>
- <profile namespace="globus" key="queue">westmere</profile>
- <profile namespace="karajan" key="jobThrottle">1000</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- </pool>
-
-</config>
Deleted: SwiftApps/modis/sites.pads.xml
===================================================================
--- SwiftApps/modis/sites.pads.xml 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/sites.pads.xml 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,16 +0,0 @@
-<config>
- <pool handle="pads">
- <execution provider="coaster" jobmanager="local:pbs" url="login.pads.ci.uchicago.edu" />
- <filesystem provider="local" />
- <workdirectory>/autonfs/gpfs-pads/projects/CI-CCR000013/davidk/swiftwork</workdirectory>
- <profile namespace="globus" key="maxtime">3600</profile>
- <profile namespace="globus" key="jobsPerNode">1</profile>
- <profile namespace="globus" key="slots">64</profile> <!-- Max number of jobs for the fast queue on PADS => 192 -->
- <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">.6399</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <profile namespace="env" key="SWIFT_GEN_SCRIPTS">KEEP</profile>
- </pool>
-</config>
Deleted: SwiftApps/modis/sites.xml
===================================================================
--- SwiftApps/modis/sites.xml 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/sites.xml 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,38 +0,0 @@
-<config>
-
- <pool handle="localhost">
- <execution provider="local" url="none"/>
- <profile namespace="karajan" key="jobThrottle">.10</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
- <filesystem provider="local"/>
- <workdirectory>/scratch/local/wilde/swift/demo/work</workdirectory>
- </pool>
-
- <pool handle="servers">
- <execution provider="ssh" url="login1.pads.ci.uchicago.edu"/>
- <filesystem provider="local"/>
- <workdirectory>/home/wilde/swiftwork</workdirectory>
- </pool>
-
- <pool handle="pbs">
- <execution provider="coaster" url="none" jobmanager="local:pbs"/>
-
- <profile namespace="globus" key="workersPerNode">1</profile>
- <profile namespace="globus" key="maxTime">3600</profile>
- <profile namespace="globus" key="maxWallTime">00:02:00</profile>
- <profile namespace="globus" key="slots">64</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">.63</profile>
- <profile namespace="karajan" key="initialScore">10000</profile>
-
- <filesystem provider="local" url="none"/>
- <workdirectory>/home/wilde/swift/lab/go/work</workdirectory>
- <scratch>/scratch/local/wilde</scratch>
-
- </pool>
-</config>
-
-
Deleted: SwiftApps/modis/tc.local
===================================================================
--- SwiftApps/modis/tc.local 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/tc.local 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,34 +0,0 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# site transformation path obsolete fields for compatibility
-
-localhost echo /bin/echo null null null
-localhost cat /bin/cat null null null
-localhost ls /bin/ls null null null
-localhost grep /bin/grep null null null
-localhost sort /bin/sort null null null
-localhost paste /bin/paste null null null
-localhost pwd /bin/pwd null null null
-
-# For cluster usage
-
-#pbs getlanduse /home/wilde/swift/demo/modis/bin/getlanduse.sh null null null
-#pbs analyzelanduse /home/wilde/swift/demo/modis/bin/analyzelanduse.sh null null null
-#pbs colormodis /home/wilde/swift/demo/modis/bin/colormodis.sh null null null
-#pbs assemble /home/wilde/swift/demo/modis/bin/assemble.sh null null null
-
-# For localhost testing
-
-localhost getlanduse /home/david/modis/bin/getlanduse.sh null null null
-localhost analyzelanduse /home/david/modis/bin/analyzelanduse2.sh null null null
-localhost colormodis /home/david/modis/bin/colormodis.sh null null null
-localhost assemble /home/david/modis/bin/assemble2.sh null null null
-localhost markmap /home/david/modis/bin/markmap.sh null null null
Deleted: SwiftApps/modis/tc.midway
===================================================================
--- SwiftApps/modis/tc.midway 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/tc.midway 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,31 +0,0 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# site transformation path obsolete fields for compatibility
-
-localhost echo /bin/echo null null null
-localhost cat /bin/cat null null null
-localhost ls /bin/ls null null null
-localhost grep /bin/grep null null null
-localhost sort /bin/sort null null null
-localhost paste /bin/paste null null null
-localhost pwd /bin/pwd null null null
-
-# For cluster usage
-midway-sandyb getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh null null null
-midway-sandyb analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse2.sh null null null
-midway-sandyb colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh null null null
-midway-sandyb assemble /scratch/midway/davidkelly999/modis/bin/assemble2.sh null null null
-midway-sandyb markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh null null null
-midway-westmere getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh null null null
-midway-westmere analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse2.sh null null null
-midway-westmere colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh null null null
-midway-westmere assemble /scratch/midway/davidkelly999/modis/bin/assemble2.sh null null null
-midway-westmere markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh null null null
Deleted: SwiftApps/modis/tc.pads
===================================================================
--- SwiftApps/modis/tc.pads 2013-01-29 22:17:02 UTC (rev 6183)
+++ SwiftApps/modis/tc.pads 2013-01-29 22:20:22 UTC (rev 6184)
@@ -1,26 +0,0 @@
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# site transformation path obsolete fields for compatibility
-
-localhost echo /bin/echo null null null
-localhost cat /bin/cat null null null
-localhost ls /bin/ls null null null
-localhost grep /bin/grep null null null
-localhost sort /bin/sort null null null
-localhost paste /bin/paste null null null
-localhost pwd /bin/pwd null null null
-
-# For cluster usage
-pads getlanduse /autonfs/gpfs-pads/projects/CI-CCR000013/davidk/modis/bin/getlanduse.sh null null null
-pads analyzelanduse /autonfs/gpfs-pads/projects/CI-CCR000013/davidk/modis/bin/analyzelanduse2.sh null null null
-pads colormodis /autonfs/gpfs-pads/projects/CI-CCR000013/davidk/modis/bin/colormodis.sh null null null
-pads assemble /autonfs/gpfs-pads/projects/CI-CCR000013/davidk/modis/bin/assemble2.sh null null null
-pads markmap /autonfs/gpfs-pads/projects/CI-CCR000013/davidk/modis/bin/markmap.sh null null null
More information about the Swift-commit
mailing list