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

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-10-02 11:32:26 -0500 (Sun, 02 Oct 2011)
New Revision: 5201

Modified:
   SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
   SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto
   SwiftApps/SwiftR/checkout-swift.sh
Log:
Make timeouts a bit longer for cray.  Checkout svn rep instead of export so that version info is included.


Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxt	2011-09-30 20:27:28 UTC (rev 5200)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxt	2011-10-02 16:32:26 UTC (rev 5201)
@@ -25,7 +25,7 @@
     <filesystem provider="local" url="none"/>
     <profile namespace="env" key="LD_LIBRARY_PATH">$LD_LIBRARY_PATH</profile>
     <!-- Longer timeout often needed on Cray configuration-->
-    <profile namespace="env" key="SWIFTR_TIMEOUT">30</profile>
+    <profile namespace="env" key="SWIFTR_TIMEOUT">60</profile>
     <profile namespace="env" key="R_LIBS_USER">$R_LIBS_USER</profile>
     
     <profile namespace="env" key="SWIFTR_TMP">/dev/shm/$USER/</profile>

Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto	2011-09-30 20:27:28 UTC (rev 5200)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxtauto	2011-10-02 16:32:26 UTC (rev 5201)
@@ -36,6 +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="jobsPerNode">$cores</profile>
     <profile namespace="globus" key="ppn">$cores</profile>
     
     <!-- these settings control the size of the request blocks
@@ -44,6 +45,7 @@
     <profile namespace="globus" key="nodeGranularity">1</profile>
     <profile namespace="globus" key="lowOverallocation">2</profile>
     <profile namespace="globus" key="highOverallocation">2</profile>
+    <profile namespace="env" key="SWIFTR_TIMEOUT">60</profile>
     <profile namespace="env" key="SWIFTR_TMP">/dev/shm/$USER/</profile>
     <profile namespace="env" key="TMPDIR">/dev/shm</profile>
     <workdirectory>/dev/shm/$USER/swiftwork</workdirectory>

Modified: SwiftApps/SwiftR/checkout-swift.sh
===================================================================
--- SwiftApps/SwiftR/checkout-swift.sh	2011-09-30 20:27:28 UTC (rev 5200)
+++ SwiftApps/SwiftR/checkout-swift.sh	2011-10-02 16:32:26 UTC (rev 5201)
@@ -23,9 +23,9 @@
 
 echo Checking out CoG source
 
-svn export https://cogkit.svn.sourceforge.net/svnroot/cogkit/tags/${COG_TAG} ${COG_SRC}
+svn checkout https://cogkit.svn.sourceforge.net/svnroot/cogkit/tags/${COG_TAG} ${COG_SRC}
 echo Checking out Swift source 
 (cd ${COG_SRC}/modules &&
-    svn export https://svn.ci.uchicago.edu/svn/vdl2/tags/${SWIFT_TAG} swift)
+    svn checkout https://svn.ci.uchicago.edu/svn/vdl2/tags/${SWIFT_TAG} swift)
 
 patch -d ${COG_SRC} -p0 < $SWIFT_PATCH