[Swift-commit] r7488 - in trunk: bin etc/templates

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-22 10:53:54 -0600 (Wed, 22 Jan 2014)
New Revision: 7488

Added:
   trunk/etc/templates/swift.properties
Modified:
   trunk/bin/swiftrun
Log:
Fix site matching issue in swiftrun
Newly formatted templates for midway and beagle


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2014-01-22 16:30:47 UTC (rev 7487)
+++ trunk/bin/swiftrun	2014-01-22 16:53:54 UTC (rev 7488)
@@ -72,7 +72,7 @@
    my $site = $_[0];
    my $pool = "\n<pool handle=\"" . $site . "\">\n";
    while( my( $key, $value ) = each( %properties ) ) {
-      if( $key =~ /^\s*site.$site/ ) {
+      if( $key =~ /^\s*site.$site\./ ) {
          my $propxml = &property_to_xml( $key, $value );
          if(defined($propxml)) {
             $pool .= $propxml;
@@ -233,7 +233,7 @@
    my $site = $_[0];
    my $isDefined=0;
    while( my( $key, $value ) = each( %properties ) ) {
-     if( $key =~ m/^site\.$site/i ) {
+     if( $key =~ m/^site\.$site\./i ) {
         $isDefined=1;
       }
    }
@@ -245,7 +245,7 @@
    my $site = $_[0];
    my $isDefined=0;
    while( my( $key, $value ) = each( %properties ) ) {
-      if( $key =~ m/^service\.$site/i ) {
+      if( $key =~ m/^service\.$site\./i ) {
          $isDefined=1;
       }
    }

Added: trunk/etc/templates/swift.properties
===================================================================
--- trunk/etc/templates/swift.properties	                        (rev 0)
+++ trunk/etc/templates/swift.properties	2014-01-22 16:53:54 UTC (rev 7488)
@@ -0,0 +1,94 @@
+#
+# Local sites
+#
+site.local {
+   jobManager=local
+   tasksPerWorker=4
+   filesystem=local
+   workdir=$RUNDIRECTORY
+   taskThrottle=4
+}
+
+#
+# Beagle sites
+# 
+site.beagle-development {
+   jobManager=pbs
+   tasksPerWorker=24
+   providerAttributes=pbs.aprun;pbs.mpp;depth=24
+   jobWalltime=00:30:00
+   maxJobs=3
+   jobGranularity=1
+   taskThrottle=72
+   initialScore=10000
+   filesystem=local
+   workDir=/lustre/beagle/$USER/swiftwork
+   jobQueue=development
+}
+
+site.beagle {
+   jobManager=pbs
+   tasksPerWorker=24
+   providerAttributes=pbs.aprun;pbs.mpp;depth=24
+   initialScore=10000
+   filesystem=local
+   workDir=/lustre/beagle/$USER/swiftwork
+   jobQueue=batch
+}
+
+#
+# Midway sites
+#
+site.midway-amd {
+   jobManager=slurm
+   tasksPerWorker=64
+   jobQueue=amd
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/swiftwork
+}
+
+site.midway-bigmem {
+   jobManager=slurm
+   tasksPerWorker=16
+   jobQueue=bigmem
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/work
+}
+
+site.midway-gpu {
+   jobManager=slurm
+   tasksPerWorker=16
+   jobQueue=gpu
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/work
+}
+
+site.midway {
+   jobManager=slurm
+   tasksPerWorker=16
+   jobQueue=sandyb
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/work
+}
+
+site.midway-sandyb {
+   jobManager=slurm
+   tasksPerWorker=16
+   jobQueue=sandyb
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/work
+}
+
+site.midway-westmere {
+   jobManager=slurm
+   tasksPerWorker=12
+   jobQueue=westmere
+   initialScore=10000
+   filesystem=local
+   workdir=/scratch/midway/$USER/work
+}