Changeset 579 for trunk

Timestamp:

Feb 20, 2007, 10:40:55 AM (18 years ago)

Author:

dkearney

Message:

adjusted the default queue for pbs. also initialized some variables. these changes allow pbs to automatically choose which queue to send jobs to.
condor seems not to work, not sure why.

File:

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

trunk/python/Rappture/queue.py

@@ -152 +152 @@
             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):
         pass
@@ -224 +217 @@
         self.execArgs(execArgs)
         nanoHUBQ = os.getenv("NANOHUB_PBS_QUEUE")
-        if nanoHUBQ is None :
-            self.queue("@vma118.punch.purdue.edu")
-        else:
+        if nanoHUBQ is not None :
             self.queue(nanoHUBQ)
 
@@ -292 +283 @@
                 (mpiCommand, self.nodes(), self.executable(), self.execArgs()))
 
-        return """#PBS -S /bin/bash
+        script = """#PBS -S /bin/bash
 #PBS -l nodes=%s:ppn=%s
 #PBS -l walltime=%s
-#PBS -q %s
+""" % (self.nodes(),self.ppn(),self.walltime())
+        if self.queue() :
+            script += "#PBS -q %s" % (self.queue())
+        script += """
 #PBS -o %s
 #PBS -e %s
@@ -308 +302 @@
 
 touch %s
-""" % ( self.nodes(),
-        self.ppn(),
-        self.walltime(),
-        self.queue(),
-        self.outFile(),
-        self.errFile(),
-        self.jobName(),
-        self.cmd(),
-        self.errFile()   )
+""" % (self.outFile(),self.errFile(),self.jobName(),self.cmd(),self.errFile())
+
+        return script
 
     def cmd(self,cmd=''):
@@ -326 +314 @@
 
     def getCurrentStatus(self):
+        pbsServer = ''
+        nanoHUBQ = ''
         retVal = self._pbs_msgs['DEFAULT']
         if self._jobId:
             nanoHUBQ = self.queue()
-            if nanoHUBQ != "":
+            if (nanoHUBQ != "") and (nanoHUBQ is not None):
                 atLocation = nanoHUBQ.find('@')
                 if atLocation > -1:
                     pbsServer = nanoHUBQ[atLocation+1:]
 
+            cmd = ''
             if pbsServer == '':
                 cmd = "qstat -a | grep \'^ *%s\'" % (self._jobId)
@@ -394 +385 @@
 
 class condor (queue):
+    # this class is not working!
 
     USE_MPI = 1
@@ -405 +397 @@
                     execArgs='',
                     walltime='00:01:00',
-                    transferFiles=[],
                     flags=0             ):
 
@@ -433 +424 @@
         self.errFile("err.$(cluster).$(process)")
         self.logFile("log.$(cluster)")
-        self.transferFiles(transferFiles)
 
     def __fillStatusDict__(self):
@@ -591 +581 @@
 
         if len(self._processList) == 0:
-            self.addProcess(inputFiles=self.transferFiles())
+            self.addProcess()
 
         submitFileData = self.__makeCondorScript__() + "\n".join(self._processList)
@@ -644 +634 @@
     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,ppn=1,walltime=walltime,transferFiles=txFileList,flags=condor.USE_MPI)
+    myCondorObj = condor(jobName,resultsDir,2,executable,walltime=walltime,flags=condor.USE_MPI)
     myCondorObj.submit()
     myCondorObj.status()