[Swift-commit] r5199 - in SwiftApps/SwiftR/Swift: . exec

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-09-30 11:05:47 -0500 (Fri, 30 Sep 2011)
New Revision: 5199

Modified:
   SwiftApps/SwiftR/Swift/DESCRIPTION
   SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto
Log:
Got crayxtauto working in cluster compatibility mode ok.  Not working with aprun yet


Modified: SwiftApps/SwiftR/Swift/DESCRIPTION
===================================================================
--- SwiftApps/SwiftR/Swift/DESCRIPTION	2011-09-30 03:02:15 UTC (rev 5198)
+++ SwiftApps/SwiftR/Swift/DESCRIPTION	2011-09-30 16:05:47 UTC (rev 5199)
@@ -1,12 +1,12 @@
 Package: Swift
 Type: Package
 Title: R interface to Swift parallel scripting languaage
-Version: 0.2.7
-Date: 2011-09-27
+Version: 0.3.0
+Date: 2011-09-30
 Author: Michael Wilde
 Maintainer: Michael Wilde <wilde at mcs.anl.gov>
 Description: Routines to invoke R functions on remote resources through Swift.
 License: Apache License
 LazyLoad: yes
-Packaged: 2011-09-27; Tim Armstrong
+Packaged: 2011-09-30; Tim Armstrong
 

Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto	2011-09-30 03:02:15 UTC (rev 5198)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto	2011-09-30 16:05:47 UTC (rev 5199)
@@ -36,7 +36,7 @@
     <!-- max number of cores in total -->
     <profile namespace="globus" key="slots">$nodes</profile>
     <profile namespace="globus" key="workersPerNode">$cores</profile>
-    <profile namespace="globus" key="ppn">$cores:cray:pack</profile>
+    <profile namespace="globus" key="ppn">$cores</profile>
     
     <!-- these settings control the size of the request blocks
         put through the batch system -->
@@ -50,7 +50,7 @@
     <scratch>/dev/shm/$USER/swiftscratch</scratch>
 
 END
-if [ "$project" != NONE]; then
+if [ "$project" != NONE ]; then
     cat >> sites.xml <<END
     <profile namespace="globus" key="project">$project</profile>
 END