Merge branch 'main' into dependabot/pip/main/globus-sdk-3.14.0

balsam/__init__.py

@@ -1,4 +1,4 @@
 from balsam.util import config_root_logger
 
-__version__ = "0.7.0.a18"
+__version__ = "0.7.0.a19"
 config_root_logger()

balsam/_api/models.py

@@ -1,5 +1,5 @@
 # This file was auto-generated via /Users/turam/opt/miniconda3/bin/python balsam/schemas/api_generator.py
-# [git rev 8578c92]
+# [git rev 3fcc4a5]
 # Do *not* make changes to the API by changing this file!
 
 import datetime

balsam/platform/app_run/app_run.py

@@ -158,6 +158,10 @@ def start(self) -> None:
         self._set_envs()
         cmdline = self._build_preamble() + self._build_cmdline()
         logger.info(f"{self.__class__.__name__} Popen: {cmdline}")
+        log_envs = ["OMP_NUM_THREADS", "OMP_PLACES"]
+        for k in log_envs:
+            if k in self._envs.keys():
+                logger.info(f"{self.__class__.__name__} envs: {k}={self._envs[k]}")
         self._outfile = self._open_outfile()
         self._pre_popen()
 

balsam/platform/app_run/polaris.py

@@ -8,7 +8,7 @@ class PolarisRun(SubprocessAppRun):
 
     def _build_cmdline(self) -> str:
         node_ids = [h for h in self._node_spec.hostnames]
-        # env_args = ",".join(self._envs.keys())
+        cpu_bind = self._launch_params.get("cpu_bind", "none")
         nid_str = ",".join(map(str, node_ids))
         args = [
             "mpiexec",
@@ -19,10 +19,9 @@ def _build_cmdline(self) -> str:
             "--hosts",
             nid_str,
             "--cpu-bind",
-            "none",
-            # "--map-by",
-            # f"ppr:{self._ranks_per_node}:node",
-            # "-envlist", env_args,
+            cpu_bind,
+            "-d",
+            self._threads_per_rank,
             self._cmdline,
         ]
         return " ".join(str(arg) for arg in args)

balsam/platform/scheduler/pbs_sched.py

@@ -187,6 +187,8 @@ def _parse_status_output(raw_output: str) -> Dict[int, SchedulerJobStatus]:
                 for jobidstr, job in j["Jobs"].items():
                     status = {}
                     try:
+                        # array jobs can have a trailing "[]"; remove this
+                        jobidstr = jobidstr.replace("[]", "")
                         jobid = int(jobidstr.split(".")[0])
                         status["scheduler_id"] = jobid
                     except ValueError: