Show More
@@ -1334,24 +1334,23 b' class CondorLauncher(BatchSystemLauncher):' | |||
|
1334 | 1334 | |
|
1335 | 1335 | job_array_regexp = CRegExp('queue\W+\$') |
|
1336 | 1336 | job_array_template = Unicode('queue {n}') |
|
1337 | # template for the submission of multiple jobs | |
|
1338 | queue_regexp = CRegExp('#PBS\W+-q\W+\$?\w+') | |
|
1339 | # regex to find a queue if the user has specified a template | |
|
1340 | queue_template = Unicode('#PBS -q {queue}') | |
|
1341 | # the queue we wish to submit to. Need to know the Condor eqiv (eg ibug cluster | |
|
1342 | # or general?) | |
|
1337 | ||
|
1343 | 1338 | |
|
1344 | 1339 | def _insert_job_array_in_script(self): |
|
1345 | 1340 | """Inserts a job array if required into the batch script. |
|
1346 | 1341 | """ |
|
1347 | print self.job_array_regexp.search(self.batch_template) | |
|
1348 | #Condor requires that the job array goes at the bottom of the | |
|
1349 | #script | |
|
1350 | 1342 | if not self.job_array_regexp.search(self.batch_template): |
|
1351 | 1343 | self.log.debug("adding job array settings to batch script") |
|
1344 | #Condor requires that the job array goes at the bottom of the script | |
|
1352 | 1345 | self.batch_template = '\n'.join([self.batch_template, |
|
1353 | 1346 | self.job_array_template]) |
|
1354 | 1347 | |
|
1348 | def _insert_queue_in_script(self): | |
|
1349 | """AFAIK, Condor doesn't have a concept of multiple queues that can be | |
|
1350 | specified in the script.. | |
|
1351 | """ | |
|
1352 | pass | |
|
1353 | ||
|
1355 | 1354 | |
|
1356 | 1355 | class CondorControllerLauncher(CondorLauncher, BatchClusterAppMixin): |
|
1357 | 1356 | """Launch a controller using Condor.""" |
General Comments 0
You need to be logged in to leave comments.
Login now