diff --git a/backend/src/v2/compiler/tektoncompiler/dag.go b/backend/src/v2/compiler/tektoncompiler/dag.go index ec357a907d..fd4159c587 100644 --- a/backend/src/v2/compiler/tektoncompiler/dag.go +++ b/backend/src/v2/compiler/tektoncompiler/dag.go @@ -371,14 +371,12 @@ func (i *pubDagDriverInputs) getDagType() string { return "DAG_PUB" } +// pubDagDriverInputs getParentDagID returns the parent node of the DAG publisher +// which should always be the DAG driver DAG ID. However, exit handler doesn't +// have driver so it's point to the root DAG ID instead. func (i *pubDagDriverInputs) getParentDagID(isExitHandler bool) string { - if i.parentDagID == "" { - return "0" - } if isExitHandler && i.parentDagID == compiler.RootComponentName { return fmt.Sprintf("$(params.%s)", paramParentDagID) - } else if i.inLoopDag { - return fmt.Sprintf("$(params.%s)", paramParentDagID) } else { return taskOutputParameter(getDAGDriverTaskName(i.parentDagID), paramExecutionID) } diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/condition_ir.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/condition_ir.yaml index 2795a67ad6..4eeb48af8d 100644 --- a/backend/src/v2/compiler/tektoncompiler/testdata/condition_ir.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/condition_ir.yaml @@ -98,7 +98,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.12'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -127,7 +127,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.12'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -156,7 +156,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.12'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -183,7 +183,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.12'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -210,7 +210,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.12'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -285,4 +285,4 @@ pipelineSpec: isOptional: true parameterType: STRING schemaVersion: 2.1.0 - sdkVersion: kfp-2.0.0-beta.12 + sdkVersion: kfp-2.0.1 diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler.yaml index df119bbe45..3b2568eca0 100755 --- a/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler.yaml @@ -44,7 +44,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","print_op"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -97,7 +97,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -205,7 +205,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","fail_op"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -258,7 +258,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -347,7 +347,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","print_op"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -400,7 +400,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -512,8 +512,8 @@ spec: - name: mlmd-server-port value: "8080" runAfter: - - fail-op - print-op-2 + - fail-op taskRef: apiVersion: custom.tekton.dev/v1alpha1 kind: KFPTask diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler_ir.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler_ir.yaml index aa6b4a4021..f42800c717 100644 --- a/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler_ir.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/exit_handler_ir.yaml @@ -62,7 +62,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -89,7 +89,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -116,7 +116,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -167,4 +167,4 @@ pipelineSpec: defaultValue: Hello World! parameterType: STRING schemaVersion: 2.1.0 - sdkVersion: kfp-2.0.0-beta.6 + sdkVersion: kfp-2.0.1 diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/loop_static.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/loop_static.yaml index 95591b1031..123d60e9f0 100644 --- a/backend/src/v2/compiler/tektoncompiler/testdata/loop_static.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/loop_static.yaml @@ -72,7 +72,7 @@ spec: - name: run-id value: $(context.pipelineRun.uid) - name: dag-execution-id - value: $(params.parent-dag-id) + value: $(tasks.for-loop-2-loop-dag-driver.results.execution-id) - name: mlmd-server-address value: metadata-grpc-service.kubeflow.svc.cluster.local - name: mlmd-server-port @@ -98,7 +98,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","concat_op"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.15'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -152,7 +152,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.15' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -239,7 +239,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","print_op"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.15'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -295,7 +295,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.15' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -427,7 +427,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","print_op"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.15'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -480,7 +480,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.15' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/loop_static_ir.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/loop_static_ir.yaml index 9022ae83cd..fd6af49a6a 100644 --- a/backend/src/v2/compiler/tektoncompiler/testdata/loop_static_ir.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/loop_static_ir.yaml @@ -87,7 +87,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.15'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -114,7 +114,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.15'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -141,7 +141,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.15'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -188,4 +188,4 @@ pipelineSpec: isOptional: true parameterType: STRING schemaVersion: 2.1.0 - sdkVersion: kfp-2.0.0-beta.15 + sdkVersion: kfp-2.0.1 diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline.yaml index 2204da7790..7cbe60e2ba 100755 --- a/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline.yaml @@ -29,7 +29,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","convert_experiment_spec_to_str"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -87,7 +87,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -175,7 +175,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","convert_katib_results"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -238,7 +238,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -458,7 +458,7 @@ spec: ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location ''kubeflow-katib==0.12.0'' - ''kfp==2.0.0-beta.6'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp + ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import *\n\ndef @@ -549,7 +549,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kubeflow-katib==0.12.0' 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kubeflow-katib==0.12.0' 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -779,7 +779,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","create_tfjob_task"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -862,7 +862,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -980,7 +980,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","convert_inference_service_to_artifact"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -1037,7 +1037,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | @@ -1125,7 +1125,7 @@ spec: value: '{"args":["--executor_input","{{$}}","--function_to_execute","create_serving_task"],"command":["sh","-c","\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1 - python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.0-beta.6'' + python3 -m pip install --quiet --no-warn-script-location ''kfp==2.0.1'' \u0026\u0026 \"$0\" \"$@\"\n","sh","-ec","program_path=$(mktemp -d)\nprintf \"%s\" \"$0\" \u003e \"$program_path/ephemeral_component.py\"\npython3 -m kfp.components.executor_main --component_module_path \"$program_path/ephemeral_component.py\" \"$@\"\n","\nimport @@ -1186,7 +1186,7 @@ spec: python3 -m ensurepip || python3 -m ensurepip --user || apt-get install python3-pip fi - PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6' && "$0" "$@" + PIP_DISABLE_PIP_VERSION_CHECK=1 python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1' && "$0" "$@" - sh - -ec - | diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline_ir.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline_ir.yaml index fe01493758..e215cccabe 100644 --- a/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline_ir.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/mnist_pipeline_ir.yaml @@ -208,7 +208,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -237,7 +237,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -266,7 +266,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -322,7 +322,7 @@ pipelineSpec: - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ \ python3 -m pip install --quiet --no-warn-script-location 'kubeflow-katib==0.12.0'\ - \ 'kfp==2.0.0-beta.6' && \"$0\" \"$@\"\n" + \ 'kfp==2.0.1' && \"$0\" \"$@\"\n" - sh - -ec - 'program_path=$(mktemp -d) @@ -422,7 +422,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -459,7 +459,7 @@ pipelineSpec: - -c - "\nif ! [ -x \"$(command -v pip)\" ]; then\n python3 -m ensurepip ||\ \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\ - \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.0-beta.6'\ + \ python3 -m pip install --quiet --no-warn-script-location 'kfp==2.0.1'\ \ && \"$0\" \"$@\"\n" - sh - -ec @@ -698,4 +698,4 @@ pipelineSpec: defaultValue: '200' parameterType: STRING schemaVersion: 2.1.0 - sdkVersion: kfp-2.0.0-beta.6 + sdkVersion: kfp-2.0.1 diff --git a/backend/src/v2/compiler/tektoncompiler/testdata/nestedloop.yaml b/backend/src/v2/compiler/tektoncompiler/testdata/nestedloop.yaml index 1955d6e64c..500b566ace 100644 --- a/backend/src/v2/compiler/tektoncompiler/testdata/nestedloop.yaml +++ b/backend/src/v2/compiler/tektoncompiler/testdata/nestedloop.yaml @@ -221,14 +221,14 @@ spec: - name: run-id value: $(context.pipelineRun.uid) - name: dag-execution-id - value: $(params.parent-dag-id) + value: $(tasks.for-loop-2-loop-dag-driver.results.execution-id) - name: mlmd-server-address value: metadata-grpc-service.kubeflow.svc.cluster.local - name: mlmd-server-port value: "8080" runAfter: - - print-op-2 - print-op + - print-op-2 taskRef: apiVersion: custom.tekton.dev/v1alpha1 kind: KFPTask