Merge pull request #278 from lsst/tickets/DM-42118

DM-42118: Allow run-qbb to have implicit threading disabled

.pre-commit-config.yaml

@@ -16,12 +16,12 @@ repos:
         # https://pre-commit.com/#top_level-default_language_version
         language_version: python3.11
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.1
     hooks:
       - id: isort
         name: isort (python)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.1.6
+    rev: v0.1.7
     hooks:
       - id: ruff

doc/changes/DM-42118.bugfix.rst

@@ -0,0 +1 @@
+Ensure that the implicit threading options for ``run-qbb`` is used so that implicit threading can be disabled.

python/lsst/ctrl/mpexec/cli/script/run.py

@@ -28,6 +28,8 @@
 import logging
 from types import SimpleNamespace
 
+from lsst.utils.threads import disable_implicit_threading
+
 from ... import CmdLineFwk, TaskFactory
 
 _log = logging.getLogger(__name__)
@@ -187,6 +189,9 @@ def run(  # type: ignore
         start_method = "spawn"
         _log.warning("Option --start-method=fork is unsafe and no longer supported, will use spawn instead.")
 
+    if not enable_implicit_threading:
+        disable_implicit_threading()
+
     args = SimpleNamespace(
         pdb=pdb,
         graph_fixup=graph_fixup,

python/lsst/ctrl/mpexec/cli/script/run_qbb.py

@@ -28,6 +28,8 @@
 import logging
 from types import SimpleNamespace
 
+from lsst.utils.threads import disable_implicit_threading
+
 from ... import CmdLineFwk, TaskFactory
 
 _log = logging.getLogger(__name__)
@@ -105,6 +107,9 @@ def run_qbb(
         start_method = "spawn"
         _log.warning("Option --start-method=fork is unsafe and no longer supported, will use spawn instead.")
 
+    if not enable_implicit_threading:
+        disable_implicit_threading()
+
     args = SimpleNamespace(
         butler_config=butler_config,
         qgraph=qgraph,

python/lsst/ctrl/mpexec/cmdLineFwk.py

@@ -750,6 +750,9 @@ def runPipeline(
             Data Butler instance, if not defined then new instance is made
             using command line options.
         """
+        if not args.enable_implicit_threading:
+            disable_implicit_threading()
+
         # Check that output run defined on command line is consistent with
         # quantum graph.
         if args.output_run and graph.metadata:
@@ -768,9 +771,6 @@ def runPipeline(
         else:
             args.clobber_outputs = False
 
-        if not args.enable_implicit_threading:
-            disable_implicit_threading()
-
         # Make butler instance. QuantumGraph should have an output run defined,
         # but we ignore it here and let command line decide actual output run.
         if butler is None:
@@ -970,6 +970,9 @@ def preExecInitQBB(self, task_factory: TaskFactory, args: SimpleNamespace) -> No
         preExecInit.initialize(qgraph)
 
     def runGraphQBB(self, task_factory: TaskFactory, args: SimpleNamespace) -> None:
+        if not args.enable_implicit_threading:
+            disable_implicit_threading()
+
         # Load quantum graph.
         nodes = args.qgraph_node_id or None
         qgraph = QuantumGraph.loadUri(args.qgraph, nodes=nodes, graphID=args.qgraph_id)