diff --git a/test/ci/buildkite/ngtf-cpu_centos-grappler.yaml b/test/ci/buildkite/ngtf-cpu_centos-grappler.yaml index 15d2f3e62..9d768f4d9 100644 --- a/test/ci/buildkite/ngtf-cpu_centos-grappler.yaml +++ b/test/ci/buildkite/ngtf-cpu_centos-grappler.yaml @@ -56,6 +56,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_centos.yaml b/test/ci/buildkite/ngtf-cpu_centos.yaml index a3db778bf..89fc89c47 100644 --- a/test/ci/buildkite/ngtf-cpu_centos.yaml +++ b/test/ci/buildkite/ngtf-cpu_centos.yaml @@ -55,6 +55,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_macos.yaml b/test/ci/buildkite/ngtf-cpu_macos.yaml index ba7c15e11..254d7785d 100644 --- a/test/ci/buildkite/ngtf-cpu_macos.yaml +++ b/test/ci/buildkite/ngtf-cpu_macos.yaml @@ -39,7 +39,7 @@ source /usr/local/var/buildkite-agent/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install -U \ /usr/local/var/buildkite-agent/tf_1.14.0_install/artifacts/tensorflow/tensorflow-1.14.0-cp37-cp37m-macosx_10_7_x86_64.whl - pip install psutil && \ + pip install psutil pip==19.3.1 && \ pip install -U /usr/local/var/buildkite-agent/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_model-test.yaml b/test/ci/buildkite/ngtf-cpu_model-test.yaml index e2018f804..0377fabd0 100644 --- a/test/ci/buildkite/ngtf-cpu_model-test.yaml +++ b/test/ci/buildkite/ngtf-cpu_model-test.yaml @@ -26,6 +26,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_ubuntu-bin-build.yaml b/test/ci/buildkite/ngtf-cpu_ubuntu-bin-build.yaml index 94a9ddd58..6729c1fba 100644 --- a/test/ci/buildkite/ngtf-cpu_ubuntu-bin-build.yaml +++ b/test/ci/buildkite/ngtf-cpu_ubuntu-bin-build.yaml @@ -38,6 +38,7 @@ - command: | source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl PYTHONPATH=`pwd` python3 test/ci/buildkite/test_runner.py \ --artifacts /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID --test_resnet diff --git a/test/ci/buildkite/ngtf-cpu_ubuntu-external-fork.yaml b/test/ci/buildkite/ngtf-cpu_ubuntu-external-fork.yaml index 7865cae5f..2372b7716 100644 --- a/test/ci/buildkite/ngtf-cpu_ubuntu-external-fork.yaml +++ b/test/ci/buildkite/ngtf-cpu_ubuntu-external-fork.yaml @@ -68,6 +68,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_ubuntu-variables.yaml b/test/ci/buildkite/ngtf-cpu_ubuntu-variables.yaml index d240feefa..7cfd40f65 100644 --- a/test/ci/buildkite/ngtf-cpu_ubuntu-variables.yaml +++ b/test/ci/buildkite/ngtf-cpu_ubuntu-variables.yaml @@ -54,6 +54,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_ubuntu.yaml b/test/ci/buildkite/ngtf-cpu_ubuntu.yaml index c590a4a99..ae2f82bfd 100644 --- a/test/ci/buildkite/ngtf-cpu_ubuntu.yaml +++ b/test/ci/buildkite/ngtf-cpu_ubuntu.yaml @@ -68,6 +68,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-cpu_ubuntu_18_04.yaml b/test/ci/buildkite/ngtf-cpu_ubuntu_18_04.yaml index f9a97d011..5bca0faa4 100644 --- a/test/ci/buildkite/ngtf-cpu_ubuntu_18_04.yaml +++ b/test/ci/buildkite/ngtf-cpu_ubuntu_18_04.yaml @@ -63,6 +63,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/test/ci/buildkite/ngtf-gpu_ubuntu.yaml b/test/ci/buildkite/ngtf-gpu_ubuntu.yaml index 798cfd9ff..1f3dfd031 100644 --- a/test/ci/buildkite/ngtf-gpu_ubuntu.yaml +++ b/test/ci/buildkite/ngtf-gpu_ubuntu.yaml @@ -42,6 +42,7 @@ source /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/venv/bin/activate pip install psutil && pip install -U \ /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/tensorflow/tensorflow-1.14.0-cp??-cp??m-linux_x86_64.whl + pip install -U pip==19.3.1 pip install -U /localdisk/buildkite/artifacts/$BUILDKITE_BUILD_ID/ngraph_tensorflow_bridge-*.whl label: ":gear: Install" diff --git a/tools/build_utils.py b/tools/build_utils.py index 8aab3a43c..36c70ee72 100755 --- a/tools/build_utils.py +++ b/tools/build_utils.py @@ -148,7 +148,7 @@ def setup_venv(venv_dir): "pip", "install", "-U", - "pip", + "pip==19.3.1", "setuptools", "psutil", "six>=1.10.0",