From d39a935334e20a90fa410064f0cff7bf2e2ffcfa Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Tue, 21 Jan 2020 14:04:43 -0800 Subject: [PATCH 1/3] Peg pip version to 19.3.1 --- tools/build_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From fd9ab1a39e0418d9e774eddf6801090a1f52871c Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Tue, 21 Jan 2020 14:46:26 -0800 Subject: [PATCH 2/3] Pep pip version prior to install 'ngraph_bridge' --- .../buildkite/ngtf-cpu_ubuntu-variables.yaml | 1 + test/model_level_tests/dump.sh | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 test/model_level_tests/dump.sh 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/model_level_tests/dump.sh b/test/model_level_tests/dump.sh new file mode 100644 index 000000000..469c4f60a --- /dev/null +++ b/test/model_level_tests/dump.sh @@ -0,0 +1,28 @@ +pwd +cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model +chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/getting_repo_ready.sh +/ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/getting_repo_ready.sh +cd /nfs/pdx/home/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests +pwd +cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP +cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model +git apply /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test1/enable_ngraph.patch +chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test1/core_run.sh +# Running test config test1: +NGRAPH_TF_LOG_PLACEMENT=1 /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test1/core_run.sh +git reset --hard +cd /nfs/pdx/home/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests + +pwd +cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP +cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model +git apply /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test2/enable_ngraph.patch +chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test2/core_run.sh +# Running test config test2: +NGRAPH_TF_LOG_PLACEMENT=1 /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test2/core_run.sh +git reset --hard +cd /nfs/pdx/home/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests + +chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/cleanup.sh +/ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/cleanup.sh +# Exiting. Done with tests in MLPrm -rf /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model From 991f6c021d3aa6a9eb7a01435b99a50fdd315144 Mon Sep 17 00:00:00 2001 From: Abolfazl Shahbazi Date: Tue, 21 Jan 2020 15:10:57 -0800 Subject: [PATCH 3/3] Pep pip to 19.3.1 after TensorFlow install --- .../buildkite/ngtf-cpu_centos-grappler.yaml | 1 + test/ci/buildkite/ngtf-cpu_centos.yaml | 1 + test/ci/buildkite/ngtf-cpu_macos.yaml | 2 +- test/ci/buildkite/ngtf-cpu_model-test.yaml | 1 + .../buildkite/ngtf-cpu_ubuntu-bin-build.yaml | 1 + .../ngtf-cpu_ubuntu-external-fork.yaml | 1 + test/ci/buildkite/ngtf-cpu_ubuntu.yaml | 1 + test/ci/buildkite/ngtf-cpu_ubuntu_18_04.yaml | 1 + test/ci/buildkite/ngtf-gpu_ubuntu.yaml | 1 + test/model_level_tests/dump.sh | 28 ------------------- 10 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 test/model_level_tests/dump.sh 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.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/test/model_level_tests/dump.sh b/test/model_level_tests/dump.sh deleted file mode 100644 index 469c4f60a..000000000 --- a/test/model_level_tests/dump.sh +++ /dev/null @@ -1,28 +0,0 @@ -pwd -cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model -chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/getting_repo_ready.sh -/ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/getting_repo_ready.sh -cd /nfs/pdx/home/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests -pwd -cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP -cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model -git apply /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test1/enable_ngraph.patch -chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test1/core_run.sh -# Running test config test1: -NGRAPH_TF_LOG_PLACEMENT=1 /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test1/core_run.sh -git reset --hard -cd /nfs/pdx/home/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests - -pwd -cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP -cd /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model -git apply /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test2/enable_ngraph.patch -chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test2/core_run.sh -# Running test config test2: -NGRAPH_TF_LOG_PLACEMENT=1 /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/test2/core_run.sh -git reset --hard -cd /nfs/pdx/home/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests - -chmod +x /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/cleanup.sh -/ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/cleanup.sh -# Exiting. Done with tests in MLPrm -rf /ec/pdx/disks/aipg_lab_home_pool_01/ashahba/source_code/tensorflow/ngraph-bridge/test/model_level_tests/models/MLP/downloaded_model