[Swift-commit] r3183 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2009-10-29 14:14:50 -0500 (Thu, 29 Oct 2009)
New Revision: 3183

Modified:
   trunk/libexec/vdl-sc.k
Log:
also added surveyor params

Modified: trunk/libexec/vdl-sc.k
===================================================================
--- trunk/libexec/vdl-sc.k	2009-10-29 15:57:04 UTC (rev 3182)
+++ trunk/libexec/vdl-sc.k	2009-10-29 19:14:50 UTC (rev 3183)
@@ -64,12 +64,13 @@
 				property("scratch", dir)
 			)
 			
+			element(p, [name, value]
+				print("	{name} = {value}")
+				property(name, value)
+			)
+			
 			element(intrepidCoasterParams, [optional(averageJobTime, blockSize)]
 				print("Setting Intrepid coaster params:")
-				element(p, [name, value]
-					print("	{name} = {value}")
-					property(name, value)
-				)
 				p("scratch", "/scratch")
 				p("workersPerNode", "4")
 				p("kernelprofile", "zeptoos")
@@ -86,6 +87,25 @@
 					print("For best results, please set the foreach.max.threads property in swift.properties to {jt}") 
 				)
 			)
+			
+			element(surveyorCoasterParams, [optional(averageJobTime, blockSize)]
+				print("Setting Surveyor coaster params:")	
+				p("scratch", "/scratch")
+				p("workersPerNode", "4")
+				p("kernelprofile", "zeptoos")
+				p("alcfbgpnat", "true")
+				maybe(
+					discard(averageJobTime)
+					blockSize := try(blockSize, 64)
+					parallelism := averageJobTime * 100	
+					p("slots", 12)
+					p("nodeGranularity", blockSize)
+					p("maxTime", 3500)
+					jt := parallelism * 2
+					p("jobThrottle", jt / 100)
+					print("For best results, please set the foreach.max.threads property in swift.properties to {jt}") 
+				)
+			)
 
 			resources(
 				executeFile(file)