Set default resources on submit and use calculated resource numbers in

templates.
ExaWorks · Jan 10, 2025 · 8fe0728 · 8fe0728
1 parent 41d4ee7
commit 8fe0728
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/src/psij/executors/batch/cobalt/cobalt.mustache b/src/psij/executors/batch/cobalt/cobalt.mustache
@@ -6,12 +6,12 @@
 #COBALT --cwd={{.}}
 {{/job.spec.directory}}
 {{#job.spec.resources}}
-    {{#node_count}}
+    {{#computed_node_count}}
 #COBALT --nodecount={{.}}
-    {{/node_count}}
-    {{#process_count}}
+    {{/computed_node_count}}
+    {{#computed_process_count}}
 #COBALT --proccount={{.}}
-    {{/process_count}}
+    {{/computed_process_count}}
 {{/job.spec.resources}}
 {{#formatted_job_duration}}
 #COBALT --time={{duration}}

diff --git a/src/psij/executors/batch/lsf/lsf.mustache b/src/psij/executors/batch/lsf/lsf.mustache
@@ -20,13 +20,13 @@
 
 {{#job.spec.resources}}
 
-    {{#node_count}}
+    {{#computed_node_count}}
 #BSUB -nnodes {{.}}
-    {{/node_count}}
+    {{/computed_node_count}}
 
-    {{#process_count}}
+    {{#computed_process_count}}
 #BSUB -n {{.}}
-    {{/process_count}}
+    {{/computed_process_count}}
 
     {{#gpu_cores_per_process}}
 #BSUB -gpu num={{.}}/task

diff --git a/src/psij/executors/batch/slurm/slurm.mustache b/src/psij/executors/batch/slurm/slurm.mustache
@@ -14,17 +14,17 @@
 #SBATCH --exclusive
     {{/exclusive_node_use}}
 
-    {{#node_count}}
+    {{#computed_node_count}}
 #SBATCH --nodes={{.}}
-    {{/node_count}}
+    {{/computed_node_count}}
 
-    {{#process_count}}
+    {{#computed_process_count}}
 #SBATCH --ntasks={{.}}
-    {{/process_count}}
+    {{/computed_process_count}}
 
-    {{#processes_per_node}}
+    {{#computed_ppn}}
 #SBATCH --ntasks-per-node={{.}}
-    {{/processes_per_node}}
+    {{/computed_ppn}}
 
     {{#gpu_cores_per_process}}
 #SBATCH --gpus-per-task={{.}}
@@ -38,9 +38,6 @@
 #SBATCH --cpus-per-task={{.}}
     {{/cpu_cores_per_process}}
 {{/job.spec.resources}}
-{{^job.spec.resources}}
-#SBATCH --nodes=1
-{{/job.spec.resources}}
 
 {{#formatted_job_duration}}
 #SBATCH --time={{.}}

diff --git a/src/psij/job_executor.py b/src/psij/job_executor.py
@@ -14,11 +14,15 @@
 from psij.job_executor_config import JobExecutorConfig
 from psij.job_launcher import Launcher
 from psij.job_spec import JobSpec
+from psij.resource_spec import ResourceSpecV1
 
 
 logger = logging.getLogger(__name__)
 
 
+_DEFAULT_RESOURCES = ResourceSpecV1()
+
+
 class JobExecutor(ABC):
     """An abstract base class for all JobExecutor implementations."""
 
@@ -92,6 +96,8 @@ def _check_job(self, job: Job) -> JobSpec:
         spec = job.spec
         if not spec:
             raise InvalidJobException('Missing specification')
+        if not spec.resources:
+            spec.resources = _DEFAULT_RESOURCES
 
         if __debug__:
             if spec.environment is not None:

diff --git a/tests/plugins1/_batch_test/test/test.mustache b/tests/plugins1/_batch_test/test/test.mustache
@@ -9,9 +9,9 @@ cd "{{.}}"
 export PSIJ_TEST_BATCH_EXEC_COUNT=1
 
 {{#job.spec.resources}}
-    {{#process_count}}
+    {{#computed_process_count}}
 export PSIJ_TEST_BATCH_EXEC_COUNT={{.}}
-    {{/process_count}}
+    {{/computed_process_count}}
 {{/job.spec.resources}}
 
 {{#job.spec.attributes}}