Integrate TF at tensorflow/tensorflow@1914c410b274
Updates TF to
[1914c410b274](https://github.com/tensorflow/tensorflow/commit/101df483a5d4)
matching
[f402e682d0ef](https://github.com/llvm/llvm-project/commit/f402e682d0ef).
Updates Docker images to use Python3 instead of Python2 since TF looks
for Python3 first as of
[ddb837a81022](https://github.com/tensorflow/tensorflow/commit/ddb837a81022). It's
still annoying that we need numpy to run our C++ code, but at least
it's modern numpy now. See https://github.com/google/iree/issues/1737.
We have to leave the `bazel-tensorflow-nvidia` image pinned at an old
version because when we rerun `apt-get install` on the nvidia driver
something gets screwed up. See
https://github.com/google/iree/issues/3550
COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/3549 from GMNGeoffrey:tf-py3 3ca109949c48ca24fc124d359271daff6e479505
PiperOrigin-RevId: 338161374
diff --git a/SUBMODULE_VERSIONS b/SUBMODULE_VERSIONS
index 2f33cb7..d3266bd 100644
--- a/SUBMODULE_VERSIONS
+++ b/SUBMODULE_VERSIONS
@@ -14,7 +14,7 @@
685f86471e9d26b3eb7676695a2e2cefb4551ae9 third_party/spirv_cross
f8bf11a0253a32375c32cad92c841237b96696c0 third_party/spirv_headers
57eb48aed36160c4876bc8310d9ca84d42ee9e2a third_party/swiftshader
-2d6bdab3adb0b8949763d5c63426338f938c9efe third_party/tensorflow
+1914c410b274055078cfb97c1f8db5d98c5f9146 third_party/tensorflow
a9a09ab0940408898fccfdcfe2bb8dc19b50f13c third_party/tracy
9bd3f561bcee3f01d22912de10bb07ce4e23d378 third_party/vulkan_headers
3528e2aed3e8808f33e1e7d63eeb1560456a605a third_party/vulkan_memory_allocator
diff --git a/build_tools/docker/bazel/Dockerfile b/build_tools/docker/bazel/Dockerfile
index a012e71..a7cda8d 100644
--- a/build_tools/docker/bazel/Dockerfile
+++ b/build_tools/docker/bazel/Dockerfile
@@ -52,9 +52,11 @@
/usr/bin/bazel-real \
/usr/bin/
-# TF requires python2 numpy at configure time...
+# TF requires python and numpy at configure time...
# TODO(#1737): Remove this
RUN apt-get update \
- && apt-get install -y python-pip \
- && python -m pip install --upgrade pip \
- && python -m pip install numpy
+ && apt-get install -y \
+ python3 \
+ python3-pip \
+ && python3 -m pip install --upgrade pip \
+ && python3 -m pip install numpy
diff --git a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/bindings/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/bindings/build_kokoro.sh
index 97d5667..199a9a2 100755
--- a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/bindings/build_kokoro.sh
+++ b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/bindings/build_kokoro.sh
@@ -32,7 +32,7 @@
docker_setup
docker run "${DOCKER_RUN_ARGS[@]?}" \
- gcr.io/iree-oss/bazel-python@sha256:1e46da0e373a9e6636c4252d32b12ce068d2fe81a5bce992b4220e91d1f76259 \
+ gcr.io/iree-oss/bazel-python@sha256:3dc3d72717edec56a7ce8a910a9333aa10bd7c9814858880325968047b3a28d4 \
build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/bindings/build.sh
# Kokoro will rsync this entire directory back to the executor orchestrating the
diff --git a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build_kokoro.sh
index b569c42..e78cd07 100755
--- a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build_kokoro.sh
+++ b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build_kokoro.sh
@@ -32,7 +32,7 @@
docker_setup
docker run "${DOCKER_RUN_ARGS[@]?}" \
- gcr.io/iree-oss/bazel@sha256:81dc9675efb57204a806b83cd988f6a07a1ca8a778119014ae7057ee53eb68d7 \
+ gcr.io/iree-oss/bazel@sha256:6b83817206384c7e8ad4f522162ee31b927ac9912095dc3ef1d3c8f580feba92 \
build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build.sh
# Kokoro will rsync this entire directory back to the executor orchestrating the
diff --git a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/integrations/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/integrations/build_kokoro.sh
index c55206d..9e9d18c 100755
--- a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/integrations/build_kokoro.sh
+++ b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/integrations/build_kokoro.sh
@@ -32,7 +32,7 @@
docker_setup
docker run "${DOCKER_RUN_ARGS[@]?}" \
- gcr.io/iree-oss/bazel-tensorflow-swiftshader@sha256:269a3a42ca71fa6b040135056f1f5639c2f2c7d651099a88ddd513a011365144 \
+ gcr.io/iree-oss/bazel-tensorflow-swiftshader@sha256:684d38c5fbb4a362476305138d4a78fab8710daa0794afe0f2e41f6b61627fe1 \
build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/integrations/build.sh
# Kokoro will rsync this entire directory back to the executor orchestrating the
diff --git a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-turing/integrations/build_kokoro.sh b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-turing/integrations/build_kokoro.sh
index 70675bb..5ba3605 100755
--- a/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-turing/integrations/build_kokoro.sh
+++ b/build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-turing/integrations/build_kokoro.sh
@@ -30,6 +30,10 @@
docker_setup
+# The image hash is pinned to an older version than that reflected by the Docker
+# hierarchy because updating nvidia/vulkan causes everything to fail for some
+# reason.
+# TODO(#3550): Allow this to follow the checked-in Docker hierarchy.
docker run "${DOCKER_RUN_ARGS[@]?}" \
--gpus all \
gcr.io/iree-oss/bazel-tensorflow-nvidia@sha256:754dc09c558157f82e9d53451486951fc096e8d2a2b9a1306a29ebfe9e0772df \
diff --git a/build_tools/kokoro/gcp_ubuntu/check_vulkan.sh b/build_tools/kokoro/gcp_ubuntu/check_vulkan.sh
index 7cfa75c..b91091e 100755
--- a/build_tools/kokoro/gcp_ubuntu/check_vulkan.sh
+++ b/build_tools/kokoro/gcp_ubuntu/check_vulkan.sh
@@ -18,7 +18,6 @@
# Log some information about the environment, initialize the submodules and then
# run the bazel integrations tests.
-set -e
set -x
# Print Vulkan related information: SDK version and GPU ICD version
