Merge pull request #457 from ExaWorks/pbs_fixes

Pbs fixes

Author: hategan

src/psij/executors/batch/pbs/pbs_classic.mustache

@@ -10,9 +10,7 @@
 {{/job.spec.inherit_environment}}
 
 {{#job.spec.resources}}
-    {{#process_count}}
-#PBS -l nodes={{job.spec.resources.computed_node_count}}:ppn={{.}}{{#job.spec.resources.gpu_cores_per_process}}:gpus={{.}}{{/job.spec.resources.gpu_cores_per_process}}
-    {{/process_count}}
+#PBS -l nodes={{computed_node_count}}:ppn={{computed_processes_per_node}}{{#gpu_cores_per_process}}:gpus={{.}}{{/gpu_cores_per_process}}
     {{#exclusive_node_use}}
 #PBS -n
     {{/exclusive_node_use}}
@@ -51,8 +49,9 @@ only results in empty files that are not cleaned up}}
 {{#job.spec.inherit_environment}}
 #PBS -V
 {{/job.spec.inherit_environment}}
+
 {{#env}}
-#PBS -v {{name}}={{value}}
+export {{name}}={{value}}
 {{/env}}
 
 PSIJ_NODEFILE="$PBS_NODEFILE"

src/psij/executors/batch/pbs/pbspro.mustache

@@ -10,9 +10,7 @@
 {{/job.spec.inherit_environment}}
 
 {{#job.spec.resources}}
-    {{#process_count}}
-#PBS -l select={{job.spec.resources.computed_node_count}}:ncpus={{.}}
-    {{/process_count}}
+#PBS -l select={{computed_node_count}}:ncpus={{computed_processes_per_node}}:mpiprocs={{computed_processes_per_node}}
     {{#exclusive_node_use}}
 #PBS -l place=scatter:exclhost
     {{/exclusive_node_use}}
@@ -54,8 +52,9 @@ only results in empty files that are not cleaned up}}
 {{#job.spec.inherit_environment}}
 #PBS -V
 {{/job.spec.inherit_environment}}
+
 {{#env}}
-#PBS -v {{name}}={{value}}
+export {{name}}={{value}}
 {{/env}}
 
 PSIJ_NODEFILE="$PBS_NODEFILE"

src/psij/resource_spec.py

@@ -100,7 +100,7 @@ def _check_constraints(self) -> None:
             # nothing specified
             self._computed_process_count = 1
             self._computed_node_count = 1
-            self._commputed_ppn = 1
+            self._computed_ppn = 1
         elif nulls == 2:
             if self.process_count is not None:
                 self._computed_node_count = 1