Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move selection of queue type to a dictionary #335

Merged
merged 5 commits into from
Sep 28, 2024
Merged

Move selection of queue type to a dictionary #335

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c2ffd4
Move selection of queue type to a dictionary
jan-janssen Sep 28, 2024
94ef6d9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 28, 2024
82da893
init function
jan-janssen Sep 28, 2024
9a9f84f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 28, 2024
88c8c73
Merge branch 'main' into queue_type_dict
jan-janssen Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 39 additions & 27 deletions pysqa/utils/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,41 @@
from pysqa.utils.execute import execute_command
from pysqa.utils.queues import Queues

queue_type_dict = {
"SGE": {
"class_name": "SunGridEngineCommands",
"module_name": "pysqa.wrapper.sge",
},
"TORQUE": {
"class_name": "TorqueCommands",
"module_name": "pysqa.wrapper.torque",
},
"SLURM": {
"class_name": "SlurmCommands",
"module_name": "pysqa.wrapper.slurm",
},
"LSF": {
"class_name": "LsfCommands",
"module_name": "pysqa.wrapper.lsf",
},
"MOAB": {
"class_name": "MoabCommands",
"module_name": "pysqa.wrapper.moab",
},
"GENT": {
"class_name": "GentCommands",
"module_name": "pysqa.wrapper.gent",
},
"REMOTE": {
"class_name": None,
"module_name": None,
},
"FLUX": {
"class_name": "FluxCommands",
"module_name": "pysqa.wrapper.flux",
},
}


class BasisQueueAdapter(object):
"""
Expand Down Expand Up @@ -41,38 +76,15 @@ def __init__(
self._config = config
self._fill_queue_dict(queue_lst_dict=self._config["queues"])
self._load_templates(queue_lst_dict=self._config["queues"], directory=directory)
if self._config["queue_type"] == "SGE":
class_name = "SunGridEngineCommands"
module_name = "pysqa.wrapper.sge"
elif self._config["queue_type"] == "TORQUE":
class_name = "TorqueCommands"
module_name = "pysqa.wrapper.torque"
elif self._config["queue_type"] == "SLURM":
class_name = "SlurmCommands"
module_name = "pysqa.wrapper.slurm"
elif self._config["queue_type"] == "LSF":
class_name = "LsfCommands"
module_name = "pysqa.wrapper.lsf"
elif self._config["queue_type"] == "MOAB":
class_name = "MoabCommands"
module_name = "pysqa.wrapper.moab"
elif self._config["queue_type"] == "GENT":
class_name = "GentCommands"
module_name = "pysqa.wrapper.gent"
elif self._config["queue_type"] == "REMOTE":
class_name = None
module_name = None
elif self._config["queue_type"] == "FLUX":
class_name = "FluxCommands"
module_name = "pysqa.wrapper.flux"
if self._config["queue_type"] in queue_type_dict.keys():
class_name = queue_type_dict[self._config["queue_type"]]["class_name"]
module_name = queue_type_dict[self._config["queue_type"]]["module_name"]
else:
raise ValueError(
"The queue_type "
+ self._config["queue_type"]
+ " is not found in the list of supported queue types "
+ str(
["SGE", "TORQUE", "SLURM", "LSF", "MOAB", "FLUX", "GENT", "REMOTE"]
)
+ str(list(queue_type_dict.keys()))
)
if self._config["queue_type"] != "REMOTE":
self._commands = getattr(importlib.import_module(module_name), class_name)()
Expand Down
Loading