##// END OF EJS Templates
force /bin/sh in default SGE/PBS/LFS templates
Justin Riley -
Show More
@@ -306,6 +306,7 b' class BatchEngineSet(object):'
306 def start(self, n):
306 def start(self, n):
307 log.msg("starting %d engines" % n)
307 log.msg("starting %d engines" % n)
308 self._temp_file = tempfile.NamedTemporaryFile()
308 self._temp_file = tempfile.NamedTemporaryFile()
309 os.chmod(self._temp_file.name, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
309 if self.template_file:
310 if self.template_file:
310 log.msg("Using %s script %s" % (self.name, self.template_file))
311 log.msg("Using %s script %s" % (self.name, self.template_file))
311 contents = open(self.template_file, 'r').read()
312 contents = open(self.template_file, 'r').read()
@@ -332,8 +333,6 b' class BatchEngineSet(object):'
332 (self.name, default_script))
333 (self.name, default_script))
333 self._temp_file.file.write(default_script)
334 self._temp_file.file.write(default_script)
334 self.template_file = self._temp_file.name
335 self.template_file = self._temp_file.name
335 self._temp_file.file.flush()
336 os.chmod(self._temp_file.name, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
337 self._temp_file.file.close()
336 self._temp_file.file.close()
338 d = getProcessOutput(self.submit_command,
337 d = getProcessOutput(self.submit_command,
339 [self.template_file],
338 [self.template_file],
@@ -357,7 +356,8 b' class PBSEngineSet(BatchEngineSet):'
357 job_array_template = '#PBS -t 1-%d'
356 job_array_template = '#PBS -t 1-%d'
358 queue_regexp = '#PBS[ \t]+-q[ \t]+\w+'
357 queue_regexp = '#PBS[ \t]+-q[ \t]+\w+'
359 queue_template = '#PBS -q %s'
358 queue_template = '#PBS -q %s'
360 default_template="""#PBS -V
359 default_template="""#!/bin/sh
360 #PBS -V
361 #PBS -t 1-%d
361 #PBS -t 1-%d
362 #PBS -N ipengine
362 #PBS -N ipengine
363 eid=$(($PBS_ARRAYID - 1))
363 eid=$(($PBS_ARRAYID - 1))
@@ -372,6 +372,7 b' class SGEEngineSet(PBSEngineSet):'
372 queue_regexp = '#\$[ \t]+-q[ \t]+\w+'
372 queue_regexp = '#\$[ \t]+-q[ \t]+\w+'
373 queue_template = '#$ -q %s'
373 queue_template = '#$ -q %s'
374 default_template="""#$ -V
374 default_template="""#$ -V
375 #$ -S /bin/sh
375 #$ -t 1-%d
376 #$ -t 1-%d
376 #$ -N ipengine
377 #$ -N ipengine
377 eid=$(($SGE_TASK_ID - 1))
378 eid=$(($SGE_TASK_ID - 1))
@@ -387,7 +388,8 b' class LSFEngineSet(PBSEngineSet):'
387 job_array_template = '#BSUB -J ipengine[1-%d]'
388 job_array_template = '#BSUB -J ipengine[1-%d]'
388 queue_regexp = '#BSUB[ \t]+-q[ \t]+\w+'
389 queue_regexp = '#BSUB[ \t]+-q[ \t]+\w+'
389 queue_template = '#BSUB -q %s'
390 queue_template = '#BSUB -q %s'
390 default_template="""#BSUB -J ipengine[1-%d]
391 default_template="""#!/bin/sh
392 #BSUB -J ipengine[1-%d]
391 eid=$(($LSB_JOBINDEX - 1))
393 eid=$(($LSB_JOBINDEX - 1))
392 ipengine --logfile=ipengine${eid}.log
394 ipengine --logfile=ipengine${eid}.log
393 """
395 """
General Comments 0
You need to be logged in to leave comments. Login now