@@ -20,16 +20,29 @@ function install_tensorflow() {
2020 # Install tensorflow from pip.
2121 #
2222 # Usage: install_tensorflow NIGHTLY_TF|NIGHTLY_TF_2|RELEASED_TF|PRERELEASED_TF|RELEASED_TF_2|PRERELEASED_TF_2 /PATH/TO/PIP /PATH/TO/PYTHON
23+
24+ # TODO(b/329181965): As TFX lags for TensorFlow version, let's pass
25+ # the ceiling TF Version to the installation script.
26+ TF_MAX_VERSION = $4
27+
2328 if [[ (" $1 " == NIGHTLY_TF) || (" $1 " == NIGHTLY_TF_2) ]]; then
2429 TF_PIP_PACKAGE=" tf-nightly"
2530 elif [[ " $1 " == RELEASED_TF ]]; then
2631 TF_PIP_PACKAGE=" tensorflow<2"
2732 elif [[ " $1 " == PRERELEASED_TF ]]; then
2833 TF_PIP_PACKAGE=" tensorflow<2"
2934 elif [[ " $1 " == RELEASED_TF_2 ]]; then
30- TF_PIP_PACKAGE=" tensorflow>=2"
35+ if [[ -z " $TF_MAX_VERSION " ]]; then
36+ TF_PIP_PACKAGE=" tensorflow>=2,<3"
37+ else
38+ TF_PIP_PACKAGE=" tensorflow>=2,<${TF_MAX_VERSION} "
39+ fi
3140 elif [[ " $1 " == PRERELEASED_TF_2 ]]; then
32- TF_PIP_PACKAGE=" tensorflow>=2"
41+ if [[ -z " $TF_MAX_VERSION " ]]; then
42+ TF_PIP_PACKAGE=" tensorflow>=2,<3"
43+ else
44+ TF_PIP_PACKAGE=" tensorflow>=2,<${TF_MAX_VERSION} "
45+ fi
3346 else
3447 echo " Invalid tensorflow version string must be one of NIGHTLY_TF, NIGHTLY_TF_2, RELEASED_TF, PRERELEASED_TF, RELEASED_TF_2, PRERELEASED_TF_2."
3548 exit 1
@@ -69,6 +82,10 @@ for i in "$@"; do
6982 shift # past argument=value
7083 SKIP_STATIC_LINK_TEST=1
7184 ;;
85+ --tf_max_version=* )
86+ shift # past argument=value
87+ TF_MAX_VERSION=${i#* =}
88+ ;;
7289 * )
7390 printf " Unrecognized argument $1 "
7491 exit 1
7895
7996set -x
8097
81- install_tensorflow ${TF_VERSION} ${PIP_BIN_PATH} ${PYTHON_BIN_PATH}
98+ install_tensorflow ${TF_VERSION} ${PIP_BIN_PATH} ${PYTHON_BIN_PATH} ${TF_MAX_VERSION}
8299./configure.sh --python_bin_path " ${PYTHON_BIN_PATH} "
83100
84101if [[ (" ${TF_VERSION} " == " NIGHTLY_TF" ) || (" ${TF_VERSION} " == " NIGHTLY_TF_2" ) ]]; then
0 commit comments