slurm cpus per node = cores per socket * threads per core * sockets per node

Author: tjfulle

src/hpc_connect/command/__init__.py

@@ -73,7 +73,7 @@ def main(argv: list[str] | None = None) -> int:
     module = _commands[args.command]
     cfg = Config()
     cfg.set_main_options(args)
-    module.execute(cfg, args)
+    module.execute(cfg, args)  # ty: ignore[unresolved-attribute]
     return 0
 
 
@@ -96,8 +96,8 @@ def make_parser() -> argparse.ArgumentParser:
 
 def add_command(subparsers: argparse._SubParsersAction, module: ModuleType) -> None:
     name = module.__name__.split(".")[-1].lower()
-    parser = subparsers.add_parser(
-        name, add_help=getattr(module, "add_help", True), help=module.description
-    )
-    module.setup_parser(parser)
+    add_help = getattr(module, "add_help", True)
+    description = getattr(module, "description", None)
+    parser = subparsers.add_parser(name, add_help=add_help, help=description)
+    module.setup_parser(parser)  # ty: ignore[unresolved-attribute]
     _commands[name] = module

src/hpc_connect/config.py

@@ -493,7 +493,7 @@ def compute_required_resources(
             assert ranks is not None
             assert ranks_per_socket is not None
             nodes = int(math.ceil(ranks / ranks_per_socket / self.sockets_per_node))
-        sockets = int(math.ceil(ranks / ranks_per_socket))
+        sockets = int(math.ceil(ranks / ranks_per_socket))  # ty: ignore[unsupported-operator]
         reqd_resources["np"] = ranks
         reqd_resources["ranks"] = ranks
         reqd_resources["ranks_per_socket"] = ranks_per_socket

src/hpc_connect/submit.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 import getpass
-import importlib
+import importlib.resources
 import os
 from abc import ABC
 from abc import abstractmethod

src/hpc_connect/util/__init__.py

@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
+import json
+import json.decoder
 import os
 import re
 import stat
@@ -46,8 +48,6 @@ def sanitize_path(path: str) -> str:
 
 
 def safe_loads(arg):
-    import json
-
     try:
         return json.loads(arg)
     except json.decoder.JSONDecodeError:

src/hpcc_slurm/submit.py

@@ -222,7 +222,8 @@ def read_sinfo() -> dict[str, Any] | None:
             return None
         else:
             sockets_per_node: int
-            cpus_per_socket: int
+            cores_per_socket: int
+            threads_per_core: int
             cpus_per_node: int
             node_count: int
             for line in proc.stdout.split("\n"):
@@ -232,7 +233,12 @@ def read_sinfo() -> dict[str, Any] | None:
                 elif parts and parts[0].startswith("SOCKETS"):
                     continue
                 data = [safe_loads(part) for part in parts]
-                sockets_per_node, cpus_per_socket, _, cpus_per_node, node_count, *gres = data
+                sockets_per_node = data[0]
+                cores_per_socket = data[1]
+                threads_per_core = data[2]
+                cpus_per_node = data[3]
+                node_count = data[4]
+                gres = data[5:]
                 break
             else:
                 raise ValueError(f"Unable to read sinfo output:\n{proc.stdout}")
@@ -248,7 +254,7 @@ def read_sinfo() -> dict[str, Any] | None:
                         "resources": [
                             {
                                 "type": "cpu",
-                                "count": cpus_per_socket,
+                                "count": cores_per_socket * threads_per_core,
                             },
                         ],
                     }

src/hpcc_subprocess/submit.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-import importlib
+import importlib.resources
 import logging
 import os
 import shutil