Update TensorFlow package in `samples` Dockerfile to 2.12.0. (#13171)
This matches what Colab currently bundles into their default hosted
runtimes.
Note: several of our Colab notebooks currently have errors (due to
recent `iree-import-tf` _and_ TensorFlow changes). This just updates the
environment that our tests run in to match Colab, so we can track the
latest errors.
Progress on https://github.com/openxla/iree/issues/13148
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
index 18ca051..85076e3 100644
--- a/.github/workflows/samples.yml
+++ b/.github/workflows/samples.yml
@@ -24,7 +24,7 @@
- name: "Testing Colab Notebooks"
run: |
./build_tools/github_actions/docker_run.sh \
- gcr.io/iree-oss/samples@sha256:efbcad1868c292932e0a293eaf62f9c15dbedb5b9944a5ff98f40befd84939eb \
+ gcr.io/iree-oss/samples@sha256:2a235ebaf2f2ed47bec4901bbd736febf7760c52ccddae46fa7a32ef21bffc76 \
./samples/colab/test_notebooks.py
samples:
@@ -35,7 +35,7 @@
- name: "Testing Samples"
run: |
./build_tools/github_actions/docker_run.sh \
- gcr.io/iree-oss/samples@sha256:efbcad1868c292932e0a293eaf62f9c15dbedb5b9944a5ff98f40befd84939eb \
+ gcr.io/iree-oss/samples@sha256:2a235ebaf2f2ed47bec4901bbd736febf7760c52ccddae46fa7a32ef21bffc76 \
./build_tools/testing/test_samples.sh
# FIXME: unify this with host build from ci.yml. This is complicated by
diff --git a/build_tools/docker/dockerfiles/samples.Dockerfile b/build_tools/docker/dockerfiles/samples.Dockerfile
index a05b059..cc21dd6 100644
--- a/build_tools/docker/dockerfiles/samples.Dockerfile
+++ b/build_tools/docker/dockerfiles/samples.Dockerfile
@@ -26,16 +26,5 @@
numpy \
matplotlib \
bottleneck \
- tensorflow==2.8.0 \
- tensorflow_hub==0.12.0
-
-# NOTE: 2022-05-27: protobuf 4.21.0, released on May 25, 2022 is incompatible
-# with prior releases. Specifically implicated are the above versions of
-# tensorflow, which seem to include it without a version pin and therefore
-# break out of the box. The next time the above versions are upgraded,
-# try removing this line and then, within the docker image, run:
-# python3 -c "import tensorflow"
-# If that fails with a stack trace, put this line back.
-# On behalf of Google, we are sorry for the live at head philosophy
-# and shoddy version management leaking into everything. We're victims too.
-RUN python3 -m pip install protobuf==3.20.1 --force-reinstall
+ tensorflow==2.12.0 \
+ tensorflow_hub==0.13.0
diff --git a/build_tools/docker/prod_digests.txt b/build_tools/docker/prod_digests.txt
index c3ec1c4..e0c7d0a 100644
--- a/build_tools/docker/prod_digests.txt
+++ b/build_tools/docker/prod_digests.txt
@@ -1,6 +1,6 @@
gcr.io/iree-oss/base@sha256:24fb5467da30c7b4c0f4c191cdf6124bda63b172d3ae98906e53b3d55ed6ddcb
gcr.io/iree-oss/swiftshader@sha256:47501aca2c3cee08358d8f8df78f7d7a36101fb9559cfe439285756620087efa
-gcr.io/iree-oss/samples@sha256:efbcad1868c292932e0a293eaf62f9c15dbedb5b9944a5ff98f40befd84939eb
+gcr.io/iree-oss/samples@sha256:2a235ebaf2f2ed47bec4901bbd736febf7760c52ccddae46fa7a32ef21bffc76
gcr.io/iree-oss/frontends@sha256:f7c5a863e3478a66aff8f3f527b5587666d3e84fe974e3f179a84eee11d79fd2
gcr.io/iree-oss/frontends-nvidia@sha256:b0df86dff8bfcf5f43eedb70d178703b4538f31a2bf45e3b2eb035724a7f6a42
gcr.io/iree-oss/frontends-swiftshader@sha256:d9448f2760b1de0dfe4a1a1d46b7ef72f0430f5937d0164f43400fdf3f811abc
