Skip to content

Commit bd5db6a

Browse files
authored
Temporarily Pin TF==2.4 until TFT 1.0 is released (#3783)
* Update dependencies.py * Update RELEASE.md * Update Dockerfile
1 parent a494f20 commit bd5db6a

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

RELEASE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525

2626
* Removed `six` dependency.
2727
* Depends on `apache-beam[gcp]>=2.29,<3`.
28-
* Depends on `tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3`.
29-
* Depends on `tensorflowjs>=3.6.0,<4`.
30-
* Depends on `tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3`.
28+
* Depends on `tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3`.
29+
* Depends on `tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3`.
3130

3231
## Documentation Updates
3332

tfx/dependencies.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def make_required_install_packages():
8787
'numpy>=1.16,<1.20',
8888
'pyarrow>=1,<3',
8989
'pyyaml>=3.12,<6',
90-
'tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3',
90+
'tensorflow>=1.15.2,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3',
9191
'tensorflow-hub>=0.9.0,<0.10',
9292
'tensorflow-data-validation' + select_constraint(
9393
default='>=0.30,<0.31',
@@ -99,7 +99,7 @@ def make_required_install_packages():
9999
nightly='>=0.31.0.dev',
100100
git_master='@git+https://github.com/tensorflow/model-analysis@master'
101101
),
102-
'tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3',
102+
'tensorflow-serving-api>=1.15,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.5.*,<3',
103103
'tensorflow-transform' + select_constraint(
104104
default='>=0.30,<0.31',
105105
nightly='>=0.31.0.dev',
@@ -150,7 +150,7 @@ def make_extra_packages_docker_image():
150150
def make_extra_packages_tfjs():
151151
# Packages needed for tfjs.
152152
return [
153-
'tensorflowjs>=3.6.0,<4',
153+
'tensorflowjs>=2.0.1.post1,<3',
154154
]
155155

156156

tfx/tools/docker/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ RUN python -m pip install --upgrade pip
2727

2828
# TODO(b/175089240): clean up conditional checks on whether ml-pipelines-sdk is
2929
# built after TFX versions <= 0.25 are no longer eligible for cherry-picks.
30+
# TODO(b/188374122): Delete pinned version of tensorflow 2.5 after all
31+
# dependencies including TFT move to TF 2.5.
3032
RUN cd ${TFX_DIR}/src; \
3133
if [ -e "package_build" ]; then \
3234
bash -x package_build/initialize.sh; \
@@ -46,10 +48,11 @@ RUN cd ${TFX_DIR}/src; \
4648
CFLAGS=$(/usr/bin/python-config --cflags) \
4749
python -m pip install \
4850
--extra-index-url https://pypi-nightly.tensorflow.org/simple \
49-
${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] ; \
51+
${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] 'tensorflow<2.5' ; \
5052
else \
5153
CFLAGS=$(/usr/bin/python-config --cflags) \
52-
python -m pip install ${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] ; \
54+
python -m pip install ${MLSDK_WHEEL} ${TFX_WHEEL}[docker-image] \
55+
'tensorflow<2.5' ; \
5356
fi;
5457

5558
# We need to name this step for the next COPY --from command.

0 commit comments

Comments
 (0)