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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-10-28 21:55:13 -0500 (Fri, 28 Oct 2011)
New Revision: 5261

Modified:
   SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto
   SwiftApps/SwiftR/Swift/src/make.include
   SwiftApps/SwiftR/checkout-swift.sh
Log:
Getting crayxtauto working with Swift 0.93 which now supports it properly

Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto	2011-10-28 03:50:31 UTC (rev 5260)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto	2011-10-29 02:55:13 UTC (rev 5261)
@@ -35,9 +35,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="jobsPerNode">$cores</profile>
-    <profile namespace="globus" key="ppn">$cores</profile>
     
     <!-- these settings control the size of the request blocks
         put through the batch system -->

Modified: SwiftApps/SwiftR/Swift/src/make.include
===================================================================
--- SwiftApps/SwiftR/Swift/src/make.include	2011-10-28 03:50:31 UTC (rev 5260)
+++ SwiftApps/SwiftR/Swift/src/make.include	2011-10-29 02:55:13 UTC (rev 5261)
@@ -1,6 +1,13 @@
 # Variables shared between makefiles
 
+# Use 0.92.1 release
 SWIFT_SRC_TAG = release-0.92.1
 COG_SRC_TAG = swift_0.92.1
 SWIFT_SRC_NAME = swift-0.92.1-SwiftR-r2
+
+# Use 0.93 release candidate branch
+#SWIFT_SRC_TAG = branches/release-0.93
+#COG_SRC_TAG = branches/4.1.9/src/cog
+#SWIFT_SRC_NAME = swift-0.93-SwiftR-r1
+
 SWIFT_SRC_PATCH = swift-0.92.1-changes.patch

Modified: SwiftApps/SwiftR/checkout-swift.sh
===================================================================
--- SwiftApps/SwiftR/checkout-swift.sh	2011-10-28 03:50:31 UTC (rev 5260)
+++ SwiftApps/SwiftR/checkout-swift.sh	2011-10-29 02:55:13 UTC (rev 5261)
@@ -24,10 +24,10 @@
 
 echo Checking out CoG source
 
-svn checkout https://cogkit.svn.sourceforge.net/svnroot/cogkit/tags/${COG_TAG} ${COG_SRC}
+svn checkout https://cogkit.svn.sourceforge.net/svnroot/cogkit/${COG_TAG} ${COG_SRC}
 echo Checking out Swift source 
 (cd ${COG_SRC}/modules &&
-    svn checkout https://svn.ci.uchicago.edu/svn/vdl2/tags/${SWIFT_TAG} swift)
+    svn checkout https://svn.ci.uchicago.edu/svn/vdl2/${SWIFT_TAG} swift)
 
 patch -d ${COG_SRC} -p0 < $SWIFT_PATCH
 (cd ${COG_SRC} && xargs -d '\n' -n 1 --arg-file=../${SWIFT_PATCH}.deleted rm -rf)