Move dotTools module and test to pipe_base.

lsst · Sep 27, 2023 · 2ce429a · 2ce429a
1 parent 0b83a1f
commit 2ce429a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 535 deletions.
diff --git a/python/lsst/ctrl/mpexec/__init__.py b/python/lsst/ctrl/mpexec/__init__.py
@@ -26,7 +26,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 from .cmdLineFwk import *
-from .dotTools import *
 from .executionGraphFixup import *
 from .mpGraphExecutor import *
 from .preExecInit import *

diff --git a/python/lsst/ctrl/mpexec/cmdLineFwk.py b/python/lsst/ctrl/mpexec/cmdLineFwk.py
@@ -71,12 +71,13 @@
     TaskDef,
     TaskFactory,
     buildExecutionButler,
+    graph2dot,
+    pipeline2dot,
 )
 from lsst.utils import doImportType
 from lsst.utils.threads import disable_implicit_threading
 
 from . import util
-from .dotTools import graph2dot, pipeline2dot
 from .executionGraphFixup import ExecutionGraphFixup
 from .mpGraphExecutor import MPGraphExecutor
 from .preExecInit import PreExecInit, PreExecInitLimited
@@ -577,10 +578,15 @@ def makePipeline(self, args: SimpleNamespace) -> Pipeline:
             pipeline.write_to_uri(args.save_pipeline)
 
         if args.expand_pipeline:
-            pipeline.write_to_uri(args.expand_pipeline, expand=True)
+            task_defs = list(pipeline)
+            pipeline.write_to_uri(args.expand_pipeline, expand=True, task_defs=task_defs)
+        else:
+            task_defs = None
 
         if args.pipeline_dot:
-            pipeline2dot(pipeline, args.pipeline_dot)
+            # Pass in existing task_defs if we have them to avoid re-importing
+            # and expanding everything.
+            pipeline2dot(pipeline if task_defs is None else task_defs, args.pipeline_dot)
 
         return pipeline
 

diff --git a/python/lsst/ctrl/mpexec/dotTools.py b/python/lsst/ctrl/mpexec/dotTools.py