Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-44647: Move pipeline-dot build from cmdLineFwk to builder #292

Merged
merged 4 commits into from
Jun 26, 2024
Merged

DM-44647: Move pipeline-dot build from cmdLineFwk to builder #292

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3608385
Move pipeline-dot build from cmdLineFwk to builder
leeskelvin Jun 6, 2024
3f16742
Use new visualization-only resolution when displaying PipelineGraphs.
TallJimbo Jun 6, 2024
4c5ce04
Modify unit tests for new show-pipeline outputs
leeskelvin Jun 20, 2024
28d8a12
Add user-visible change document to doc/changes
leeskelvin Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions python/lsst/ctrl/mpexec/cli/cmd/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,12 @@ def build(ctx: click.Context, **kwargs: Any) -> None:
"""
kwargs = _collectActions(ctx, **kwargs)
show = ShowInfo(kwargs.pop("show", []))
if kwargs.get("butler_config") is not None and {"pipeline-graph", "task-graph"}.isdisjoint(show.commands):
if kwargs.get("butler_config") is not None and (
{"pipeline-graph", "task-graph"}.isdisjoint(show.commands) and not kwargs.get("pipeline_dot")
):
raise click.ClickException(
"--butler-config was provided but nothing uses it "
"(only --show pipeline-graph and --show task-graph do)."
"(only --show pipeline-graph, --show task-graph and --pipeline-dot do)."
)
script.build(**kwargs, show=show)
_unhandledShow(show, "build")
Expand Down
10 changes: 10 additions & 0 deletions python/lsst/ctrl/mpexec/cli/script/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
from types import SimpleNamespace

from lsst.daf.butler import Butler
from lsst.pipe.base.pipeline_graph import visualization

from ... import CmdLineFwk
from ..utils import _PipelineAction
Expand Down Expand Up @@ -114,6 +115,15 @@
else:
butler = None

if pipeline_dot:
with open(pipeline_dot, "w") as stream:
visualization.show_dot(

Check warning on line 120 in python/lsst/ctrl/mpexec/cli/script/build.py

View check run for this annotation

Codecov / codecov/patch

python/lsst/ctrl/mpexec/cli/script/build.py#L120 

Added line #L120 was not covered by tests
pipeline.to_graph(butler.registry if butler is not None else None),
stream,
dataset_types=True,
task_classes="full",
)

show.show_pipeline_info(pipeline, butler=butler)

return pipeline
5 changes: 1 addition & 4 deletions python/lsst/ctrl/mpexec/cmdLineFwk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
from lsst.utils.logging import getLogger
from lsst.utils.threads import disable_implicit_threading

from .dotTools import graph2dot, pipeline2dot
from .dotTools import graph2dot
from .executionGraphFixup import ExecutionGraphFixup
from .mpGraphExecutor import MPGraphExecutor
from .preExecInit import PreExecInit, PreExecInitLimited
Expand Down Expand Up @@ -582,9 +582,6 @@ def makePipeline(self, args: SimpleNamespace) -> Pipeline:
if args.save_pipeline:
pipeline.write_to_uri(args.save_pipeline)

if args.pipeline_dot:
pipeline2dot(pipeline, args.pipeline_dot)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am now thinking how this PR relates to #159 given that this is the only usage of pipeline2dot and that PR was removing it completely.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this fully supersedes #159. I'm also planning to RFC dropping support for QuantumGraph GraphViz outputs, since my understanding is that those are always too big for dot to render in practice anyway, and then we can get rid of dotTools.py entirely.


return pipeline

def makeGraph(self, pipeline: Pipeline, args: SimpleNamespace) -> QuantumGraph | None:
Expand Down
Loading