From 93c56316381f63f744af09e3bf474edf68c7f804 Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Fri, 4 Oct 2019 18:58:11 -0700 Subject: [PATCH] SDK - Containers - Made python package installation more robust Fixes https://github.com/kubeflow/pipelines/issues/2252 On some systems (e.g. in DL VM containers) `pip3` does not point to the same environment as `python3`. --- sdk/python/kfp/containers/_component_builder.py | 4 ++-- sdk/python/tests/compiler/component_builder_test.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/python/kfp/containers/_component_builder.py b/sdk/python/kfp/containers/_component_builder.py index 648a7338dba..bf1b85e93ac 100644 --- a/sdk/python/kfp/containers/_component_builder.py +++ b/sdk/python/kfp/containers/_component_builder.py @@ -140,9 +140,9 @@ def _generate_dockerfile(filename, base_image, python_version, requirement_filen if requirement_filename is not None: f.write('ADD ' + requirement_filename + ' /ml/requirements.txt\n') if python_version == 'python3': - f.write('RUN pip3 install -r /ml/requirements.txt\n') + f.write('RUN python3 -m pip install -r /ml/requirements.txt\n') else: - f.write('RUN pip install -r /ml/requirements.txt\n') + f.write('RUN python -m pip install -r /ml/requirements.txt\n') for src_path, dst_path in (add_files or {}).items(): f.write('ADD ' + src_path + ' ' + dst_path + '\n') diff --git a/sdk/python/tests/compiler/component_builder_test.py b/sdk/python/tests/compiler/component_builder_test.py index 031cdfb95e8..4b136110cc7 100644 --- a/sdk/python/tests/compiler/component_builder_test.py +++ b/sdk/python/tests/compiler/component_builder_test.py @@ -122,7 +122,7 @@ def test_generate_dockerfile(self): FROM gcr.io/ngao-mlpipeline-testing/tensorflow:1.10.0 RUN apt-get update -y && apt-get install --no-install-recommends -y -q python3 python3-pip python3-setuptools ADD requirements.txt /ml/requirements.txt -RUN pip3 install -r /ml/requirements.txt +RUN python3 -m pip install -r /ml/requirements.txt ADD main.py /ml/main.py ''' @@ -130,7 +130,7 @@ def test_generate_dockerfile(self): FROM gcr.io/ngao-mlpipeline-testing/tensorflow:1.10.0 RUN apt-get update -y && apt-get install --no-install-recommends -y -q python python-pip python-setuptools ADD requirements.txt /ml/requirements.txt -RUN pip install -r /ml/requirements.txt +RUN python -m pip install -r /ml/requirements.txt ADD main.py /ml/main.py ''' # check