[Swift-commit] r7496 - trunk/etc/templates

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-22 16:41:14 -0600 (Wed, 22 Jan 2014)
New Revision: 7496

Modified:
   trunk/etc/templates/swift.properties
Log:
Updates templates from 0.95


Modified: trunk/etc/templates/swift.properties
===================================================================
--- trunk/etc/templates/swift.properties	2014-01-22 22:40:44 UTC (rev 7495)
+++ trunk/etc/templates/swift.properties	2014-01-22 22:41:14 UTC (rev 7496)
@@ -14,6 +14,7 @@
 # 
 site.beagle-development {
    jobManager=pbs
+   jobQueue=development
    tasksPerWorker=24
    providerAttributes=pbs.aprun;pbs.mpp;depth=24
    jobWalltime=00:30:00
@@ -23,17 +24,27 @@
    initialScore=10000
    filesystem=local
    workDir=/lustre/beagle/$USER/swiftwork
-   jobQueue=development
 }
 
 site.beagle {
    jobManager=pbs
+   jobQueue=batch
    tasksPerWorker=24
    providerAttributes=pbs.aprun;pbs.mpp;depth=24
    initialScore=10000
    filesystem=local
    workDir=/lustre/beagle/$USER/swiftwork
+}
+
+site.beagle-ssh {
+   jobManager=login4.beagle.ci.uchicago.edu:pbs
    jobQueue=batch
+   tasksPerWorker=24
+   providerAttributes=pbs.aprun;pbs.mpp;depth=24
+   initialScore=10000
+   filesystem=local
+   workDir=/lustre/beagle/$USER/swiftwork
+   userHomeOverride=/lustre/beagle/$USER
 }
 
 #
@@ -41,8 +52,8 @@
 #
 site.midway-amd {
    jobManager=slurm
+   jobQueue=amd
    tasksPerWorker=64
-   jobQueue=amd
    initialScore=10000
    filesystem=local
    workdir=/scratch/midway/$USER/swiftwork
@@ -50,8 +61,8 @@
 
 site.midway-bigmem {
    jobManager=slurm
+   jobQueue=bigmem
    tasksPerWorker=16
-   jobQueue=bigmem
    initialScore=10000
    filesystem=local
    workdir=/scratch/midway/$USER/work
@@ -59,8 +70,8 @@
 
 site.midway-gpu {
    jobManager=slurm
+   jobQueue=gpu
    tasksPerWorker=16
-   jobQueue=gpu
    initialScore=10000
    filesystem=local
    workdir=/scratch/midway/$USER/work
@@ -68,7 +79,16 @@
 
 site.midway {
    jobManager=slurm
+   jobQueue=sandyb
    tasksPerWorker=16
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/work
+}
+
+site.midway-ssh {
+   jobManager=midway.rcc.uchicago.edu:slurm
+   tasksPerWorker=16
    jobQueue=sandyb
    initialScore=10000
    filesystem=local
@@ -77,8 +97,8 @@
 
 site.midway-sandyb {
    jobManager=slurm
+   jobQueue=sandyb
    tasksPerWorker=16
-   jobQueue=sandyb
    initialScore=10000
    filesystem=local
    workdir=/scratch/midway/$USER/work
@@ -86,9 +106,32 @@
 
 site.midway-westmere {
    jobManager=slurm
+   jobQueue=westmere
    tasksPerWorker=12
-   jobQueue=westmere
    initialScore=10000
    filesystem=local
    workdir=/scratch/midway/$USER/work
 }
+
+# 
+# OSG Sites
+# 
+site.osgconnect {
+   jobManager=condor
+   initialScore=10000
+   tasksPerWorker=1
+   jobGranularity=1
+   jobType=nonshared
+   condor.+ProjectName=Swift
+   workdir=.
+}
+
+site.osgconnect-ssh {
+   jobManager=login.osgconnect.net:condor
+   initialScore=10000
+   tasksPerWorker=1
+   jobGranularity=1
+   jobType=nonshared
+   condor.+ProjectName=Swift
+   workdir=.
+}