Merge pull request #7 from simevo/wip/paolog/account_qos

add `account` and `qos` options

Author: byjtew

README.md

@@ -174,6 +174,8 @@ with every _SBATCH_VAR_ replaced by _SLURM_VAR_.
 | CI_**SLURM_CI_SLURM_NICE**     | [--nice](https://slurm.schedmd.com/sbatch.html#OPT_nice)                        |     ✅     |                              |                                        |
 | CI_**SLURM_MEM_PER_CPU**       | [--mem-per-cpu](https://slurm.schedmd.com/sbatch.html#OPT_mem-per-cpu)          |     ✅     |                              |                                        |
 | CI_**SLURM_COMMENT**           | [--comment](https://slurm.schedmd.com/sbatch.html#OPT_comment)                  |     ✅     |                              | `Automatic job created from GitLab CI` |
+| CI_**SLURM_ACCOUNT**           | [-A / --account](https://slurm.schedmd.com/sbatch.html#OPT_account)             |     ✅     |                              |                                        |
+| CI_**SLURM_QOS**               | [--qos](https://slurm.schedmd.com/sbatch.html#OPT_qos)                          |     ✅     |                              |                                        |
 | CI_**SLURM_GPUS**              | [-G / --gpus](https://slurm.schedmd.com/sbatch.html#OPT_gpus)                   |     ⌛     |                              |                                        |
 | CI_**SLURM_GPUS_PER_NODE**     | [--gpus-per-node](https://slurm.schedmd.com/sbatch.html#OPT_gpus-per-node)      |     ⌛     |                              |                                        |
 | CI_**SLURM_GPUS_PER_TASK**     | [--gpus-per-task](https://slurm.schedmd.com/sbatch.html#OPT_gpus-per-task)      |     ⌛     |                              |                                        |

driver/driver.py

@@ -248,6 +248,8 @@ def prepare():
             nice=GitLabJobInterface.get_env("CI_SLURM_NICE"),
             comment=GitLabJobInterface.get_env("CI_SLURM_COMMENT", "Automatic job created from GitLab CI"),
             chdir=GitLabJobInterface.get_build_dir_path(),
+            account=GitLabJobInterface.get_env("CI_SLURM_ACCOUNT"),
+            qos=GitLabJobInterface.get_env("CI_SLURM_QOS"),
             export="ALL",
             stdout_file="stdout.log",
             stderr_file="stderr.log"

driver/slurm_interface.py

@@ -146,6 +146,8 @@ def __init__(
             export: str = None,
             stdout_file: str = None,
             stderr_file: str = None,
+            account: str = None,
+            qos: str = None,
     ):
         self.job_name = job_name
         self.nodes = nodes
@@ -168,6 +170,8 @@ def __init__(
         self.export = export
         self.stdout_file = stdout_file
         self.stderr_file = stderr_file
+        self.account = account
+        self.qos = qos
 
     def get_cli_parameters(self) -> List[str]:
         parameters = [
@@ -192,6 +196,8 @@ def get_cli_parameters(self) -> List[str]:
             f"--export={self.export}" if self.export is not None else None,
             f"--output={self.stdout_file}" if self.stdout_file is not None else None,
             f"--error={self.stderr_file}" if self.stderr_file is not None else None,
+            f"--account={self.account}" if self.account is not None else None,
+            f"--qos={self.qos}" if self.qos is not None else None,
         ]
         return [x for x in parameters if x is not None]