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

Reducing the PR 926 diff #2

Merged
merged 3 commits into from
Apr 25, 2019
Merged

Reducing the PR 926 diff #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41a04e7
Cleaning up the diff (before moving things back)
Ark-kun Apr 24, 2019
5deabd3
Renamed op.deps back to op.dependent_names
Ark-kun Apr 24, 2019
c76a48d
Moved Container, Sidecar and BaseOp classed back to _container_op.py
Ark-kun Apr 24, 2019
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
2 changes: 1 addition & 1 deletion sdk/python/kfp/compiler/_op_to_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from ._k8s_helper import K8sHelper
from .. import dsl
from ..dsl._base_op import BaseOp
from ..dsl._container_op import BaseOp

# generics
T = TypeVar('T')
Expand Down
10 changes: 5 additions & 5 deletions sdk/python/kfp/compiler/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def _get_dependencies(self, pipeline, root_group, op_groups, opsgroups_groups, o
for param in op.inputs + list(condition_params[op.name]):
if param.op_name:
upstream_op_names.add(param.op_name)
upstream_op_names |= set(op.deps)
upstream_op_names |= set(op.dependent_names)

for op_name in upstream_op_names:
# the dependent op could be either a BaseOp or an opsgroup
Expand Down Expand Up @@ -612,8 +612,8 @@ def _compile(self, pipeline_func):
if op.output is not None:
op.output.name = K8sHelper.sanitize_k8s_name(op.output.name)
op.output.op_name = K8sHelper.sanitize_k8s_name(op.output.op_name)
if op.deps:
op.deps = [K8sHelper.sanitize_k8s_name(name) for name in op.deps]
if op.dependent_names:
op.dependent_names = [K8sHelper.sanitize_k8s_name(name) for name in op.dependent_names]
if op.file_outputs is not None:
sanitized_file_outputs = {}
for key in op.file_outputs.keys():
Expand All @@ -635,8 +635,8 @@ def _compile(self, pipeline_func):
if rop.output is not None:
rop.output.name = K8sHelper.sanitize_k8s_name(rop.output.name)
rop.output.op_name = K8sHelper.sanitize_k8s_name(rop.output.op_name)
if rop.deps:
rop.deps = [K8sHelper.sanitize_k8s_name(name) for name in rop.deps]
if rop.dependent_names:
rop.dependent_names = [K8sHelper.sanitize_k8s_name(name) for name in rop.dependent_names]
if rop.attribute_outputs is not None:
sanitized_attribute_outputs = {}
for key in rop.attribute_outputs.keys():
Expand Down
3 changes: 1 addition & 2 deletions sdk/python/kfp/dsl/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

from ._pipeline_param import PipelineParam, match_serialized_pipelineparam
from ._pipeline import Pipeline, pipeline, get_pipeline_conf
from ._base_op import Sidecar
from ._container_op import ContainerOp
from ._container_op import ContainerOp, Sidecar
from ._resource_op import ResourceOp
from ._volume_op import (
VolumeOp, VOLUME_MODE_RWO, VOLUME_MODE_RWM, VOLUME_MODE_ROM
Expand Down
Loading