Temporarily Pin TF==2.4 until TFT 1.0 is released (#3783)

* Update dependencies.py

* Update RELEASE.md

* Update Dockerfile

RELEASE.md

@@ -25,9 +25,8 @@
 
 *   Removed `six` dependency.
 *   Depends on `apache-beam[gcp]>=2.29,<3`.
-*   Depends on `tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3`.
-*   Depends on `tensorflowjs>=3.6.0,<4`.
-*   Depends on `tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3`.
+*   Depends on `tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3`.
+*   Depends on `tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3`.
 
 ## Documentation Updates
 

tfx/dependencies.py

@@ -87,7 +87,7 @@ def make_required_install_packages():
       'numpy>=1.16,<1.20',
       'pyarrow>=1,<3',
       'pyyaml>=3.12,<6',
-      'tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3',
+      'tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3',
       'tensorflow-hub>=0.9.0,<0.10',
       'tensorflow-data-validation' + select_constraint(
           default='>=0.30,<0.31',
@@ -99,7 +99,7 @@ def make_required_install_packages():
           nightly='>=0.31.0.dev',
           git_master='@git+https://github.com/tensorflow/model-analysis@master'
       ),
-      'tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3',
+      'tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3',
       'tensorflow-transform' + select_constraint(
           default='>=0.30,<0.31',
           nightly='>=0.31.0.dev',
@@ -150,7 +150,7 @@ def make_extra_packages_docker_image():
 def make_extra_packages_tfjs():
   # Packages needed for tfjs.
   return [
-      'tensorflowjs>=3.6.0,<4',
+      'tensorflowjs>=2.0.1.post1,<3',
   ]
 
 

tfx/tools/docker/Dockerfile

@@ -27,6 +27,8 @@ RUN python -m pip install --upgrade pip
 
 # TODO(b/175089240): clean up conditional checks on whether ml-pipelines-sdk is
 # built after TFX versions <= 0.25 are no longer eligible for cherry-picks.
+# TODO(b/188374122): Delete pinned version of tensorflow 2.5 after all
+# dependencies including TFT move to TF 2.5.
 RUN cd ${TFX_DIR}/src; \
     if [ -e "package_build" ]; then \
       bash -x package_build/initialize.sh; \
@@ -46,10 +48,11 @@ RUN cd ${TFX_DIR}/src; \
       CFLAGS=$(/usr/bin/python-config --cflags) \
         python -m pip install \
           --extra-index-url https://pypi-nightly.tensorflow.org/simple \
-          ${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] ; \
+          ${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] 'tensorflow<2.5' ; \
     else \
       CFLAGS=$(/usr/bin/python-config --cflags) \
-        python -m pip install ${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] ; \
+        python -m pip install ${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] \
+        'tensorflow<2.5' ; \
     fi;
 
 # We need to name this step for the next COPY --from command.