Merge pull request #36047 from tensorflow/mm-r2.0-fix-release-builds-pt3

Third attempt at fixing the release builds
tensorflow · Jan 20, 2020 · 1a617d6 · 1a617d6
2 parents fe523f0 + 32d9138
commit 1a617d6
Show file tree

Hide file tree

Showing 75 changed files with 8 additions and 3,005 deletions.
diff --git a/tensorflow/tools/ci_build/release/common.sh b/tensorflow/tools/ci_build/release/common.sh
@@ -145,9 +145,9 @@ function install_pip_deps {
   ${SUDO_CMD} ${PIP_CMD} install portpicker
   ${SUDO_CMD} ${PIP_CMD} install scipy
   ${SUDO_CMD} ${PIP_CMD} install scikit-learn==0.20.3
-  ${SUDO_CMD} ${PIP_CMD} install --upgrade tb-nightly
+  ${SUDO_CMD} ${PIP_CMD} install --upgrade tb-nightly==2.1.0a20190927
   ${PIP_CMD} install --user --upgrade attrs
-  ${PIP_CMD} install --user --upgrade tf-estimator-nightly
+  ${PIP_CMD} install --user --upgrade tf-estimator-nightly==1.14.0.dev2019072801
   ${PIP_CMD} install --user --upgrade "future>=0.17.1"
   # ===================================================================
 }
@@ -181,8 +181,8 @@ function install_ubuntu_16_pip_deps {
   "${PIP_CMD}" install portpicker --user
   "${PIP_CMD}" install scipy --user
   "${PIP_CMD}" install scikit-learn --user
-  "${PIP_CMD}" install --user --upgrade tf-estimator-nightly
-  "${PIP_CMD}" install --user --upgrade tb-nightly
+  "${PIP_CMD}" install --user --upgrade tf-estimator-nightly==1.14.0.dev2019072801
+  "${PIP_CMD}" install --user --upgrade tb-nightly==2.1.0a20190927
   # ===================================================================
 }
 
@@ -222,9 +222,9 @@ function install_macos_pip_deps {
   ${SUDO_CMD} ${PIP_CMD} install gast==0.2.2
   ${SUDO_CMD} ${PIP_CMD} install h5py==2.8.0
   ${SUDO_CMD} ${PIP_CMD} install --upgrade grpcio
-  ${SUDO_CMD} ${PIP_CMD} install --upgrade tb-nightly
+  ${SUDO_CMD} ${PIP_CMD} install --upgrade tb-nightly==2.1.0a20190927
   ${PIP_CMD} install --user --upgrade attrs
-  ${PIP_CMD} install --user --upgrade tf-estimator-nightly
+  ${PIP_CMD} install --user --upgrade tf-estimator-nightly==1.14.0.dev2019072801
   ${PIP_CMD} install --user --upgrade "future>=0.17.1"
 }
 

diff --git a/tensorflow/tools/ci_build/release/common_win.bat b/tensorflow/tools/ci_build/release/common_win.bat
@@ -28,8 +28,8 @@ SET PATH=%PATH%;C:\%PYTHON_DIRECTORY%
 
 %PIP_EXE% install setuptools --upgrade
 %PIP_EXE% install future>=0.17.1 --no-deps
-%PIP_EXE% install tf-estimator-nightly --no-deps
-%PIP_EXE% install tb-nightly --no-deps
+%PIP_EXE% install tf-estimator-nightly==1.14.0.dev2019072801 --no-deps
+%PIP_EXE% install tb-nightly==2.1.0a20190927 --no-deps
 %PIP_EXE% install numpy --upgrade --no-deps
 %PIP_EXE% install opt_einsum --upgrade
 %PIP_EXE% install pandas --upgrade --no-deps

diff --git a/tensorflow/tools/ci_build/release/macos/cpu_libtensorflow/build.sh b/tensorflow/tools/ci_build/release/macos/cpu_libtensorflow/build.sh
diff --git a/tensorflow/tools/ci_build/release/macos/cpu_libtensorflow/release.sh b/tensorflow/tools/ci_build/release/macos/cpu_libtensorflow/release.sh
diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py2_full/nightly_release.sh b/tensorflow/tools/ci_build/release/macos/cpu_py2_full/nightly_release.sh
diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py2_full/nonpip.sh b/tensorflow/tools/ci_build/release/macos/cpu_py2_full/nonpip.sh
diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py2_full/nonpip_v1.sh b/tensorflow/tools/ci_build/release/macos/cpu_py2_full/nonpip_v1.sh
diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py2_full/pip.sh b/tensorflow/tools/ci_build/release/macos/cpu_py2_full/pip.sh
diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py2_full/pip_v1.sh b/tensorflow/tools/ci_build/release/macos/cpu_py2_full/pip_v1.sh