0.2.1: support for tinygpu using slurm

Author: richrobe

hpc_helper/_hpc_helper.py

@@ -250,7 +250,7 @@ def build_job_submit_slurm(
     sbatch = _check_command_for_target_system("sbatch", target_system=target_system)
     sbatch_command = f"{sbatch} --job-name {job_name} --nodes={nodes} --ntasks-per-node={tasks_per_node} "
     if target_system == "tinygpu":
-        sbatch_command += f"gres={gres} "
+        sbatch_command += f"--gres={gres} "
     sbatch_command += f"--time={walltime} --mail-type={mail_type} {script_name} "
 
     sbatch_command = _add_arguments_slurm(sbatch_command, args, **kwargs)

tests/test_hpc_helper.py

@@ -164,28 +164,28 @@ def test_build_job_submit_slurm_raises(self, target_system, expected):
                 "tinygpu",
                 None,
                 {},
-                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 "
+                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 --gres=gpu:1 "
                 f"--time=24:00:00 --mail-type=ALL jobscript.sh",
             ),
             (
                 "tinygpu",
                 ["path1", "path2"],
                 {},
-                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 "
+                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 --gres=gpu:1 "
                 f'--time=24:00:00 --mail-type=ALL jobscript.sh PARAMS="path1 path2"',
             ),
             (
                 "tinygpu",
                 ["path1", ""],
                 {"SUBJECT_DIR": "path3"},
-                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 "
+                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 --gres=gpu:1 "
                 f'--time=24:00:00 --mail-type=ALL jobscript.sh PARAMS="path1" SUBJECT_DIR=path3',
             ),
             (
                 "tinygpu",
                 None,
                 {"SUBJECT_DIR": "path3"},
-                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 "
+                "sbatch.tinygpu --job-name Test_Job --nodes=1 --ntasks-per-node=4 --gres=gpu:1 "
                 f"--time=24:00:00 --mail-type=ALL jobscript.sh SUBJECT_DIR=path3",
             ),
         ],