(testing)

Add TORQUE option to Everest

src/everest/config/simulator_config.py

@@ -65,7 +65,7 @@ class SimulatorConfig(BaseModel, HasErtQueueOptions, extra="forbid"):  # type: i
         Examples to set memory requirement is:
         * rusage[mem=1000]""",
     )
-    queue_system: Optional[Literal["lsf", "local", "slurm"]] = Field(
+    queue_system: Optional[Literal["lsf", "local", "slurm", "torque"]] = Field(
         default="local",
         description="Defines which queue system the everest server runs on.",
     )

src/everest/config_keys.py

@@ -120,6 +120,20 @@ class ConfigKeys:
     TEMPLATE = "template"
     TIME_CORR = "time_correlation"
     TIMES_LIST = "times_list"
+    TORQUE = "torque"
+    TORQUE_QSUB_CMD = "qsub_cmd"
+    TORQUE_QSTAT_CMD = "qstat_cmd"
+    TORQUE_QDEL_CMD = "qdel_cmd"
+    TORQUE_QSTAT_OPTIONS = "qstat_options"
+    TORQUE_QUEUE = "queue"
+    TORQUE_CLUSTER_LABEL = "cluster_label"
+    TORQUE_NUM_NODES = "num_nodes"
+    TORQUE_NUM_CPUS_PER_NODE = "num_cpus_per_node"
+    TORQUE_MEMORY_PER_JOB = "memory_per_job"
+    TORQUE_KEEP_QSUB_OUTPUT = "keep_qsub_output"
+    TORQUE_SUBMIT_SLEEP = "submit_sleep"
+    TORQUE_QUEUE_QUERY_TIMEOUT = "queue_query_timeout"
+    TORQUE_PROJECT_CODE = "project_code"
     TYPE = "type"
     UPPER_BOUND = "upper_bound"
     USER_DEFINED_TYPE = "user_defined_type"

src/everest/queue_driver/queue_driver.py

@@ -28,6 +28,22 @@
     (ConfigKeys.SLURM_INCLUDE_HOST_OPTION, "INCLUDE_HOST"),
 ]
 
+_TORQUE_OPTIONS = [
+    (ConfigKeys.CORES, "MAX_RUNNING"),
+    (ConfigKeys.TORQUE_QSUB_CMD, "QSUB_CMD"),
+    (ConfigKeys.TORQUE_QSTAT_CMD, "QSTAT_CMD"),
+    (ConfigKeys.TORQUE_QDEL_CMD, "QDEL_CMD"),
+    (ConfigKeys.TORQUE_QSTAT_OPTIONS, "QSTAT_OPTIONS"),
+    (ConfigKeys.TORQUE_QUEUE, "QUEUE"),
+    (ConfigKeys.TORQUE_CLUSTER_LABEL, "CLUSTER_LABEL"),
+    (ConfigKeys.TORQUE_NUM_NODES, "NUM_NODES"),
+    (ConfigKeys.TORQUE_NUM_CPUS_PER_NODE, "NUM_CPUS_PER_NODE"),
+    (ConfigKeys.TORQUE_MEMORY_PER_JOB, "MEMORY_PER_JOB"),
+    (ConfigKeys.TORQUE_KEEP_QSUB_OUTPUT, "KEEP_QSUB_OUTPUT"),
+    (ConfigKeys.TORQUE_SUBMIT_SLEEP, "SUBMIT_SLEEP"),
+    (ConfigKeys.TORQUE_QUEUE_QUERY_TIMEOUT, "QUEUE_QUERY_TIMEOUT"),
+    (ConfigKeys.TORQUE_PROJECT_CODE, "PROJECT_CODE"),
+]
 
 def _extract_ert_queue_options_from_simulator_config(
     simulator: Optional[SimulatorConfig], queue_system
@@ -51,6 +67,10 @@ def _extract_ert_queue_options_from_simulator_config(
         return simulator.extract_ert_queue_options(
             queue_system=QueueSystem.SLURM, everest_to_ert_key_tuples=_SLURM_OPTIONS
         )
+    elif queue_system == ConfigKeys.TORQUE:
+        return simulator.extract_ert_queue_options(
+            queue_system=QueueSystem.TORQUE, everest_to_ert_key_tuples=_TORQUE_OPTIONS
+        )
 
     raise KeyError(
         f"Invalid queue_system: {queue_system}, "