LbProdRun 1.6.0__tar.gz → 1.7.0__tar.gz

{LbProdRun-1.6.0/src/LbProdRun.egg-info → lbprodrun-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LbProdRun
-Version: 1.6.0
+Version: 1.7.0
 Summary: CLI for running LHCb applications from LHCbDIRAC
 Home-page: https://gitlab.cern.ch/lhcb-core/lbprodrun
 License: GPL-3.0-only

{LbProdRun-1.6.0 → lbprodrun-1.7.0}/src/LbProdRun/__init__.py

@@ -53,8 +53,11 @@ def _write_prod_conf_options(job_spec, path: Path, verbose=False):
         "FirstEventNumber": job_spec.input.first_event_number,
         "TCK": job_spec.input.tck,
         "ProcessingPass": job_spec.options.processing_pass,
-        "NThreads": job_spec.application.number_of_processors,
     }
+    if _uses_gaudi_mp(job_spec.application.name, job_spec.application.version):
+        data["NThreads"] = 1
+    else:
+        data["NThreads"] = job_spec.application.number_of_processors
 
     lines = ["from ProdConf import ProdConf", ""]
     lines += ["ProdConf("]
@@ -235,8 +238,9 @@ def _make_gaudirun_command(job_spec):
 
     command = []
     command += job_spec.options.command
-    if job_spec.application.number_of_processors > 1:
-        command += ["--ncpus", f"{job_spec.application.number_of_processors}"]
+    if _uses_gaudi_mp(job_spec.application.name, job_spec.application.version):
+        if job_spec.application.number_of_processors > 1:
+            command += ["--ncpus", f"{job_spec.application.number_of_processors}"]
     command += job_spec.options.files
     command += [str(prod_conf_fn)]
 
@@ -257,8 +261,12 @@ def _make_gaudirun_command(job_spec):
     return command
 
 
-def _is_new_style(name: str, version: str) -> bool:
-    """Determine if a given application/version combination should use lbexec"""
+def _parse_version(version: str) -> Union[Version, bool]:
+    """Parse a version string into a Version object
+
+    If this fails, it will return a bool indicating a safe default value
+    for if an application supports modern features or not.
+    """
     try:
         parsed_version = Version(re.sub(r"[^\d]+", ".", version).strip("."))
     except Exception:  # pylint: disable=broad-except
@@ -266,6 +274,14 @@ def _is_new_style(name: str, version: str) -> bool:
         if version == "HEAD":
             return True
         return False
+    return parsed_version
+
+
+def _is_new_style(name: str, version: str) -> bool:
+    """Determine if a given application/version combination should use lbexec"""
+    parsed_version = _parse_version(version)
+    if isinstance(parsed_version, bool):
+        return parsed_version
 
     version_compatibility: dict[str, Union[bool, Version]] = {
         "Analysis": Version("40"),
@@ -293,6 +309,19 @@ def _is_new_style(name: str, version: str) -> bool:
     return is_new_style < parsed_version
 
 
+def _uses_gaudi_mp(name: str, version: str) -> bool:
+    parsed_version = _parse_version(version)
+    if isinstance(parsed_version, bool):
+        return parsed_version
+
+    # Gauss v60+ supports multi-threading despite still using ProdConf
+    if name == "Gauss":
+        return parsed_version < Version("60")
+
+    # Otherwise assume only lbexec-style applications support native multi-threading
+    return _is_new_style(name, version)
+
+
 def _prepare_env():
     """Get a dictionary containing the environment that should be used for the job"""
     env = os.environ.copy()

{LbProdRun-1.6.0 → lbprodrun-1.7.0/src/LbProdRun.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LbProdRun
-Version: 1.6.0
+Version: 1.7.0
 Summary: CLI for running LHCb applications from LHCbDIRAC
 Home-page: https://gitlab.cern.ch/lhcb-core/lbprodrun
 License: GPL-3.0-only