[Swift-commit] r4341 - SwiftApps/SwiftR/Swift/exec

[tga at ci.uchicago.edu]

Author: tga
Date: 2011-04-12 11:40:10 -0500 (Tue, 12 Apr 2011)
New Revision: 4341

Modified:
   SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
   SwiftApps/SwiftR/Swift/exec/start-swift
Log:
Settings for crayxt which work for inslge core case


Modified: SwiftApps/SwiftR/Swift/exec/configure-server-crayxt
===================================================================
--- SwiftApps/SwiftR/Swift/exec/configure-server-crayxt	2011-04-12 15:56:42 UTC (rev 4340)
+++ SwiftApps/SwiftR/Swift/exec/configure-server-crayxt	2011-04-12 16:40:10 UTC (rev 4341)
@@ -31,12 +31,16 @@
     <execution provider="coaster" url="none" jobmanager="local:NA"/>
     <profile namespace="globus" key="workerManager">passive</profile>
     <profile namespace="globus" key="workersPerNode">$cores</profile>
+    <!--
+    <profile namespace="globus" key="workersPerNode">1</profile>
+    -->
     <profile namespace="karajan" key="jobThrottle">$throttlePBS</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
     <filesystem provider="local" url="none"/>
     <profile namespace="env" key="SWIFTR_TMP">$LUSTRE_TMP</profile>
     <profile namespace="env" key="TMP">$LUSTRE_TMP</profile>
     <profile namespace="env" key="LD_LIBRARY_PATH">$LD_LIBRARY_PATH</profile>
+    <profile namespace="env" key="SWIFTR_TIMEOUT">5</profile>
     <profile namespace="env" key="R_LIBS_USER">$R_LIBS_USER</profile>
     <workdirectory>$LUSTRE_TMP/swiftwork</workdirectory>
     <scratch>$LUSTRE_TMP/swiftscratch</scratch>

Modified: SwiftApps/SwiftR/Swift/exec/start-swift
===================================================================
--- SwiftApps/SwiftR/Swift/exec/start-swift	2011-04-12 15:56:42 UTC (rev 4340)
+++ SwiftApps/SwiftR/Swift/exec/start-swift	2011-04-12 16:40:10 UTC (rev 4341)
@@ -213,8 +213,8 @@
 
 #TODO: lustre working directory?
 
-aprun -N 1 -d $cores -n $(($cores*$nodes)) \
-    /usr/bin/perl $SWIFTBIN/worker.pl $CONTACT SwiftR-\$h $HOME/.globus/coasters $IDLETIMEOUT
+aprun -B -F exclusive -cc none \
+    /usr/bin/perl $SWIFTBIN/worker.pl $CONTACT SwiftR $HOME/.globus/coasters $IDLETIMEOUT
 
 END
 }