Skip to content

Commit 5d67bf3

Browse files
committed
Check the parallel environments for the bare queue name.
Fixes bcbio/bcbio-nextgen#2441
1 parent 47ad4a7 commit 5d67bf3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cluster_helper/cluster.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -345,15 +345,15 @@ def _prep_sge_resource(resource):
345345
def _find_parallel_environment(queue):
346346
"""Find an SGE/OGE parallel environment for running multicore jobs in specified queue.
347347
"""
348-
base_queue = os.path.splitext(queue)[0]
348+
base_queue, ext = os.path.splitext(queue)
349349
queue = base_queue + ".q"
350350

351351
available_pes = []
352352
for name in subprocess.check_output(["qconf", "-spl"]).decode().strip().split():
353353
if name:
354354
for line in subprocess.check_output(["qconf", "-sp", name]).decode().split("\n"):
355355
if _has_parallel_environment(line):
356-
if _queue_can_access_pe(name, queue) or _queue_can_access_pe(name, base_queue):
356+
if _queue_can_access_pe(name, queue) or _queue_can_access_pe(name, base_queue) or _queue_can_access_pe(name, base_queue + ext):
357357
available_pes.append(name)
358358
if len(available_pes) == 0:
359359
raise ValueError("Could not find an SGE environment configured for parallel execution. "

0 commit comments

Comments
 (0)