experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove --force-reinstall from tb and tfe. Update tfe to latest.

Browse Source 
Having `--force-reinstall` brings in `numpy-1.20` which has a backwards incompatible change. This is a stop gap to fix broken builds but we should convert to installing from a requirements file instead of expliclty listing dependencies (in 6 different places!!!!!)

Also, update estimator to the latest release. It seems we forgot this step after last release.

PiperOrigin-RevId: 355173614
Change-Id: Ia5b235d3df34631a80dcae9b4a101fdd17575295
This commit is contained in:
Mihai Maruseac 2021-02-02 08:39:54 -08:00 committed by TensorFlower Gardener
parent d6aa6d6bf4
commit 7d7c5a29a7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tensorflow/tools/ci_build/release/common.sh
View File

@ -144,8 +144,8 @@ function install_ubuntu_16_pip_deps {
"${PIP_CMD}" install --user 'gast == 0.4.0'
# Finally, install tensorboard and estimator
# Note that here we want the latest version that matches (b/156523241)
"${PIP_CMD}" install --user --upgrade --force-reinstall 'tb-nightly ~= 2.4.0.a'
"${PIP_CMD}" install --user --upgrade --force-reinstall 'tensorflow_estimator ~= 2.3.0'
"${PIP_CMD}" install --user --upgrade 'tb-nightly ~= 2.4.0.a'
"${PIP_CMD}" install --user --upgrade 'tensorflow_estimator ~= 2.4.0'
# Test dependencies
"${PIP_CMD}" install --user 'grpcio ~= 1.34.0'
"${PIP_CMD}" install --user 'portpicker ~= 1.3.1'
@ -201,8 +201,8 @@ function install_ubuntu_16_python_pip_deps {
${PIP_CMD} install --user 'gast == 0.4.0'
# Finally, install tensorboard and estimator
# Note that here we want the latest version that matches (b/156523241)
${PIP_CMD} install --user --upgrade --force-reinstall 'tb-nightly ~= 2.4.0.a'
${PIP_CMD} install --user --upgrade --force-reinstall 'tensorflow_estimator ~= 2.3.0'
${PIP_CMD} install --user --upgrade 'tb-nightly ~= 2.4.0.a'
${PIP_CMD} install --user --upgrade 'tensorflow_estimator ~= 2.4.0'
# Test dependencies
${PIP_CMD} install --user 'grpcio ~= 1.34.0'
${PIP_CMD} install --user 'portpicker ~= 1.3.1'
@ -244,8 +244,8 @@ function install_macos_pip_deps {
${PIP_CMD} install 'gast == 0.4.0'
# 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'
${PIP_CMD} install --upgrade 'tb-nightly ~= 2.4.0.a'
${PIP_CMD} install --upgrade 'tensorflow_estimator ~= 2.4.0'
# Test dependencies
${PIP_CMD} install 'grpcio ~= 1.34.0'
${PIP_CMD} install 'portpicker ~= 1.3.1'
@ -291,8 +291,8 @@ function install_macos_pip_deps_no_venv {
${PIP_CMD} install 'gast == 0.4.0' --user
# 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' --user
${PIP_CMD} install --upgrade --force-reinstall 'tensorflow_estimator ~= 2.3.0' --user
${PIP_CMD} install --upgrade 'tb-nightly ~= 2.4.0.a' --user
${PIP_CMD} install --upgrade 'tensorflow_estimator ~= 2.4.0' --user
# Test dependencies
${PIP_CMD} install 'grpcio ~= 1.34.0' --user
${PIP_CMD} install 'portpicker ~= 1.3.1' --user

4
tensorflow/tools/ci_build/release/common_win.bat
View File

@ -50,8 +50,8 @@ SET PATH=%PATH%;C:\%PYTHON_DIRECTORY%
%PY_EXE% -m pip install "gast == 0.4.0"
@REM Finally, install tensorboard and estimator
@REM Note that here we want the latest version that matches (b/156523241)
%PY_EXE% -m pip install --upgrade --force-reinstall "tb-nightly ~= 2.4.0.a"
%PY_EXE% -m pip install --upgrade --force-reinstall "tensorflow_estimator ~= 2.3.0"
%PY_EXE% -m pip install --upgrade "tb-nightly ~= 2.4.0.a"
%PY_EXE% -m pip install --upgrade "tensorflow_estimator ~= 2.4.0"
@REM Test dependencies
%PY_EXE% -m pip install "grpcio ~= 1.34.0"
%PY_EXE% -m pip install "portpicker ~= 1.3.1"

2
tensorflow/tools/pip_package/setup.py
View File

@ -101,7 +101,7 @@ REQUIRED_PACKAGES = [
# They are updated during the release process
# When updating these, please also update the nightly versions below
'tensorboard ~= 2.4',
'tensorflow_estimator ~= 2.3.0',
'tensorflow_estimator ~= 2.4.0',
]