[Swift-commit] r3600 - trunk/libexec

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2010-09-03 21:31:42 -0500 (Fri, 03 Sep 2010)
New Revision: 3600

Modified:
   trunk/libexec/vdl-int-staging.k
Log:
no need to create the input file dirs since by the time we get there, the input files should already be staged in in those directories

Modified: trunk/libexec/vdl-int-staging.k
===================================================================
--- trunk/libexec/vdl-int-staging.k	2010-09-04 02:25:41 UTC (rev 3599)
+++ trunk/libexec/vdl-int-staging.k	2010-09-04 02:31:42 UTC (rev 3600)
@@ -27,15 +27,6 @@
 			pathnames(stageins)
 		)
 
-		element(fileDirs, [stageins, stageouts]
-			list(
-				unique(
-					inFileDirs(stageins)
-					outFileDirs(stageouts)
-				)
-			)
-		)
-
 		element(graphStuff, [tr, stagein, stageout, err, optional(args)]
 			if(
 				vdl:configProperty("pgraph") != "false" then(
@@ -89,10 +80,8 @@
 				jobdir := substring(uid, from=0, to=1)
 				jobid := "{tr}-{uid}"
 
-				fileDirs := fileDirs(stagein, stageout)
-
 				log(LOG:DEBUG, "THREAD_ASSOCIATION jobid={jobid} thread={#thread} host={rhost} replicationGroup={replicationGroup}")
-
+				
 				wrapper := "_swiftwrap.staging"
 				wrapfile := "{ddir}/param-{jobid}"
 
@@ -119,7 +108,7 @@
 								"-out", stdout,
 								"-err", stderr,
 								"-i", maybe(stdin),
-								"-d", flatten(each(fileDirs)),
+								"-d", flatten(unique(outFileDirs(stageout))),
 								"-if", flatten(infiles(stagein)),
 								"-of", flatten(outfiles(stageout)),
 								"-k",
@@ -130,7 +119,8 @@
 							directory = "{wfdir}-{jobdir}-{jobid}"
 							redirect = false
 							host = rhost
-							vdl:tcprofile(rhost, tr = tr) //this gets various app params from the tc, such as environment, walltime, etc
+							
+							vdl:tcprofile(rhost, tr = tr) //this gets various app params from the tc, such as environment, walltime, etc 
 							replicationGroup = replicationGroup
 							replicationChannel = replicationChannel
 							jobid = jobid