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.

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

[KFP] Fix watch=True for remote pipeline when using set_workflow #5572

Merged
merged 18 commits into from
May 15, 2024
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0b9a6bd
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 3, 2024
b5c9c51
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 4, 2024
4f123bc
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 4, 2024
7e2361a
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 8, 2024
0494f74
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 10, 2024
d94e63c
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 16, 2024
467895d
Merge branch 'development' of github.com:mlrun/mlrun into development
Apr 18, 2024
7b8d539
Merge branch 'development' of github.com:mlrun/mlrun into development
May 2, 2024
4f25791
Merge branch 'development' of github.com:mlrun/mlrun into development
May 2, 2024
9f11f2c
Merge branch 'development' of github.com:mlrun/mlrun into development
May 2, 2024
6eaa6bb
Merge branch 'development' of github.com:mlrun/mlrun into development
May 6, 2024
18ba739
Merge branch 'development' of github.com:mlrun/mlrun into development
May 7, 2024
1633265
Merge branch 'development' of github.com:mlrun/mlrun into development
May 7, 2024
0ff4d02
Merge branch 'development' of github.com:mlrun/mlrun into development
May 9, 2024
0ebfb18
Merge branch 'development' of github.com:mlrun/mlrun into development
May 15, 2024
aa4de0d
Merge branch 'development' of github.com:mlrun/mlrun into development
May 15, 2024
783eadd
fix remote watch
May 15, 2024
f40b273
fmt
May 15, 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
10 changes: 7 additions & 3 deletions mlrun/projects/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -2962,8 +2962,12 @@ def run(
engine = "remote"
# The default engine is kfp if not given:
workflow_engine = get_workflow_engine(engine or workflow_spec.engine, local)
if not inner_engine and engine == "remote":
inner_engine = get_workflow_engine(workflow_spec.engine, local).engine
if not inner_engine and workflow_engine.engine == "remote":
# if inner engine is set to remote, assume kfp as the default inner engine with remote as the runner
engine_kind = (
workflow_spec.engine if workflow_spec.engine != "remote" else "kfp"
)
inner_engine = get_workflow_engine(engine_kind, local).engine
workflow_spec.engine = inner_engine or workflow_engine.engine

run = workflow_engine.run(
Expand Down Expand Up @@ -2991,7 +2995,7 @@ def run(
# run's engine gets replaced with inner engine if engine is remote,
# so in that case we need to get the status from the remote engine manually
# TODO: support watch for remote:local
if engine == "remote" and status_engine.engine != "local":
if workflow_engine.engine == "remote" and status_engine.engine != "local":
status_engine = _RemoteRunner

status_engine.get_run_status(project=self, run=run, timeout=timeout)
Expand Down
Loading