Changeset 539

Timestamp:

Nov 7, 2006 10:07:52 AM (17 years ago)

Author:

dkearney

Message:

fixed up condor code and example so it now runs properly

File:

• trunk/python/Rappture/queue.py (modified) (6 diffs)

trunk/python/Rappture/queue.py

@@ -151 +151 @@
         else: 
             self._queue_vars['jobName'] = jobName
+
+    def transferFiles(self,transferFiles=[]):
+        transferFiles = list(transferFiles)
+        if (len(transferFiles) == 0)  or (jobName == []):
+            return self._queue_vars['transferFiles']
+        else:
+            self._queue_vars['transferFiles'] = transferFiles
 
     def __convertWalltime__(self):
@@ -387 +394 @@
 
 class condor (queue):
-    # this class is not working!
 
     USE_MPI = 1
@@ -399 +405 @@
                     execArgs='',
                     walltime='00:01:00',
+                    transferFiles=[],
                     flags=0             ):
 
@@ -426 +433 @@
         self.errFile("err.$(cluster).$(process)")
         self.logFile("log.$(cluster)")
+        self.transferFiles(transferFiles)
 
     def __fillStatusDict__(self):
@@ -583 +591 @@
 
         if len(self._processList) == 0:
-            self.addProcess()
+            self.addProcess(inputFiles=self.transferFiles())
 
         submitFileData = self.__makeCondorScript__() + "\n".join(self._processList)
@@ -636 +644 @@
     resultsDir = createDir('4321')
     executable = './hello.sh'
+    txFileList = ['hello']
     shutil.copy('hello/hello.sh',resultsDir)
     shutil.copy('hello/hello',resultsDir)
-    myCondorObj = condor(jobName,resultsDir,2,executable,walltime=walltime,flags=condor.USE_MPI)
+    myCondorObj = condor(jobName,resultsDir,2,executable,ppn=1,walltime=walltime,transferFiles=txFileList,flags=condor.USE_MPI)
     myCondorObj.submit()
     myCondorObj.status()