From 4679dcf1eed1d13bdc3f6288afcd46395b8e84c0 Mon Sep 17 00:00:00 2001
From: Amit Patankar <amitpatankar@google.com>
Date: Wed, 2 Dec 2020 21:45:31 -0800
Subject: [PATCH] Hotfix the MacOS build.
PiperOrigin-RevId: 345377479
Change-Id: Ied0140fb2564035cee0f22b388b04c6e7f1d5d5c
---
.../ci_build/presubmit/macos/py37_cc/build.sh | 2 +-
tensorflow/tools/ci_build/release/common.sh | 33 +++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/tensorflow/tools/ci_build/presubmit/macos/py37_cc/build.sh b/tensorflow/tools/ci_build/presubmit/macos/py37_cc/build.sh
index 54bdd261fdf..b6e224db6f3 100644
--- a/tensorflow/tools/ci_build/presubmit/macos/py37_cc/build.sh
+++ b/tensorflow/tools/ci_build/presubmit/macos/py37_cc/build.sh
@@ -27,7 +27,7 @@ set -x
function setup_pip () {
python3.7 -m virtualenv tf_build_env --system-site-packages
source tf_build_env/bin/activate
- install_macos_pip_deps
+ install_macos_pip_deps_virtualenv
}
function run_build () {
diff --git a/tensorflow/tools/ci_build/release/common.sh b/tensorflow/tools/ci_build/release/common.sh
index 5ffa5ac5c46..067c7a89588 100644
--- a/tensorflow/tools/ci_build/release/common.sh
+++ b/tensorflow/tools/ci_build/release/common.sh
@@ -151,6 +151,38 @@ function install_ubuntu_16_pip_deps {
"${PIP_CMD}" install --user 'PyYAML ~= 5.3.1'
}
+# TODO(amitpatankar): Move this function logic into install_macos_pip_deps.
+function install_macos_pip_deps_virtualenv {
+ PIP_CMD="pip"
+ ${PIP_CMD} install --upgrade setuptools pip wheel
+ # Now, install the deps, as listed in setup.py
+ ${PIP_CMD} install 'absl-py ~= 0.10'
+ ${PIP_CMD} install 'astunparse ~= 1.6.3'
+ ${PIP_CMD} install 'flatbuffers ~= 1.12.0'
+ ${PIP_CMD} install 'google_pasta ~= 0.2'
+ ${PIP_CMD} install 'h5py ~= 2.10.0'
+ ${PIP_CMD} install 'keras_preprocessing ~= 1.1.2'
+ ${PIP_CMD} install 'numpy ~= 1.19.2'
+ ${PIP_CMD} install 'opt_einsum ~= 3.3.0'
+ ${PIP_CMD} install 'protobuf >= 3.9.2'
+ ${PIP_CMD} install 'six ~= 1.15.0'
+ ${PIP_CMD} install 'termcolor ~= 1.1.0'
+ ${PIP_CMD} install 'typing_extensions ~= 3.7.4'
+ ${PIP_CMD} install 'wheel ~= 0.35'
+ ${PIP_CMD} install 'wrapt ~= 1.12.1'
+ # We need to pin gast dependency exactly
+ ${PIP_CMD} install 'gast == 0.3.3'
+ # Finally, install tensorboard and estimator
+ # Note that here we want the latest version that matches (b/156523241)
+ ${PIP_CMD} install --upgrade --force-reinstall 'tb-nightly ~= 2.4.0.a'
+ ${PIP_CMD} install --upgrade --force-reinstall 'tensorflow_estimator ~= 2.3.0'
+ # Test dependencies
+ ${PIP_CMD} install 'grpcio ~= 1.32.0'
+ ${PIP_CMD} install 'portpicker ~= 1.3.1'
+ ${PIP_CMD} install 'scipy ~= 1.5.2'
+ ${PIP_CMD} install 'twine ~= 3.2.0'
+}
+
function install_macos_pip_deps {
# TODO(mihaimaruseac): Remove need for sudo, then this can be merged with
# above (probably needs to convert to venv too).
@@ -206,6 +238,7 @@ function install_macos_pip_deps {
# LINT.ThenChange(:linux_pip_installations)
}
+
function maybe_skip_v1 {
# If we are building with v2 by default, skip tests with v1only tag.
if grep -q "build --config=v2" ".bazelrc"; then