Bump cmake to 3.16.3. (#7180)
* The thing that tipped it was lack of NumPy configuration in 3.13.
* Picked 3.16.3 because it is deployed with Ubuntu 20.04LTS, which at least gives it a pretty big fanout with respect to use (more as a "hey, this gets used a lot and may be ok" vs "we need to pin to Ubuntu").
diff --git a/build_tools/docker/cmake-android/Dockerfile b/build_tools/docker/cmake-android/Dockerfile
index 50d1354..062123e 100644
--- a/build_tools/docker/cmake-android/Dockerfile
+++ b/build_tools/docker/cmake-android/Dockerfile
@@ -16,7 +16,7 @@
RUN unzip "android-ndk-${NDK_VERSION?}-linux-x86_64.zip" -d /usr/src/
-FROM gcr.io/iree-oss/cmake-python@sha256:055eba8441ada5e0241f102241747e8d61196dca7f04316a0bfd68d2769883dc AS final
+FROM gcr.io/iree-oss/cmake-python@sha256:7e31103ee35f52e6d6019adf474bc60758710e95f20ee33ed94aee3f8780edbd AS final
ARG NDK_VERSION
COPY --from=install-ndk "/usr/src/android-ndk-${NDK_VERSION}" "/usr/src/android-ndk-${NDK_VERSION}"
ENV ANDROID_NDK "/usr/src/android-ndk-${NDK_VERSION}"
diff --git a/build_tools/docker/cmake-bazel-frontends-android/Dockerfile b/build_tools/docker/cmake-bazel-frontends-android/Dockerfile
index f2e953a..3f5eb39 100644
--- a/build_tools/docker/cmake-bazel-frontends-android/Dockerfile
+++ b/build_tools/docker/cmake-bazel-frontends-android/Dockerfile
@@ -4,12 +4,12 @@
# See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-FROM gcr.io/iree-oss/cmake-bazel-frontends@sha256:fe83ae0dd3f1948ee04e256ed0cfa9983b1cffe548cd36d53e5def490cca752e AS final
+FROM gcr.io/iree-oss/cmake-bazel-frontends@sha256:37694fe7cf9f5624b5c09502848605f6035790c907f0b274454c3574ec1d416d AS final
# Note that NDK_VERSION should be kept in sync with the one in cmake-android.
# That actually means this isn't really an ARG because we cannot build this
# image with a different NDK version.
ARG NDK_VERSION=r21d
-COPY --from=gcr.io/iree-oss/cmake-android@sha256:297493826856f1374bad858a106c72d03a0d9d7d0302afe4d62016e10e0ee308 "/usr/src/android-ndk-${NDK_VERSION}" "/usr/src/android-ndk-${NDK_VERSION}"
+COPY --from=gcr.io/iree-oss/cmake-android@sha256:478fd1790e2bcc788ca52a7e3d1e514de713e97847fc14e2d33abb05bc40a4f6 "/usr/src/android-ndk-${NDK_VERSION}" "/usr/src/android-ndk-${NDK_VERSION}"
ENV ANDROID_NDK "/usr/src/android-ndk-${NDK_VERSION}"
diff --git a/build_tools/docker/cmake-bazel-frontends-nvidia/Dockerfile b/build_tools/docker/cmake-bazel-frontends-nvidia/Dockerfile
index acabed2..5d816e3 100644
--- a/build_tools/docker/cmake-bazel-frontends-nvidia/Dockerfile
+++ b/build_tools/docker/cmake-bazel-frontends-nvidia/Dockerfile
@@ -33,7 +33,7 @@
# does not support Ubuntu 18.04.
# This allows to share configuration with base CMake, but it also means we need
# to MATCH the driver version between the host machine and the docker image.
-FROM gcr.io/iree-oss/cmake-bazel-frontends-vulkan@sha256:19cc43e7c57986ff4befc121389412e731c3d6a3f4d571a3a3d99c11e34d37b8 AS final
+FROM gcr.io/iree-oss/cmake-bazel-frontends-vulkan@sha256:46627a46b1366be665ab2e518ad6b6f79594373db0da5af414f290f51442a45f AS final
ARG NVIDIA_COMMON_DEB
ARG NVIDIA_GL_DEB
ARG NVIDIA_COMPUTE_DEB
diff --git a/build_tools/docker/cmake-bazel-frontends-swiftshader/Dockerfile b/build_tools/docker/cmake-bazel-frontends-swiftshader/Dockerfile
index 30f722a..ba17e59 100644
--- a/build_tools/docker/cmake-bazel-frontends-swiftshader/Dockerfile
+++ b/build_tools/docker/cmake-bazel-frontends-swiftshader/Dockerfile
@@ -4,8 +4,8 @@
# See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-FROM gcr.io/iree-oss/cmake-bazel-frontends-vulkan@sha256:19cc43e7c57986ff4befc121389412e731c3d6a3f4d571a3a3d99c11e34d37b8 AS final
-COPY --from=gcr.io/iree-oss/swiftshader@sha256:7f3947c8494c7a7ae92a48a219b21b5e2ef34bff339a893d0254a33f047e9e10 \
+FROM gcr.io/iree-oss/cmake-bazel-frontends-vulkan@sha256:46627a46b1366be665ab2e518ad6b6f79594373db0da5af414f290f51442a45f AS final
+COPY --from=gcr.io/iree-oss/swiftshader@sha256:54265ebefcd6464ade8a6b36a3105f6219a2bb804c4a3b2052880fd4213d72a3 \
/swiftshader /swiftshader
# Set VK_ICD_FILENAMES so Vulkan loader can find the SwiftShader ICD.
diff --git a/build_tools/docker/cmake-bazel-frontends-vulkan/Dockerfile b/build_tools/docker/cmake-bazel-frontends-vulkan/Dockerfile
index 3259452..584e1e7 100644
--- a/build_tools/docker/cmake-bazel-frontends-vulkan/Dockerfile
+++ b/build_tools/docker/cmake-bazel-frontends-vulkan/Dockerfile
@@ -7,7 +7,7 @@
# This image provides the Vulkan SDK. Requires a child image to provide
# a Vulkan ICD.
-FROM gcr.io/iree-oss/cmake-bazel-frontends@sha256:fe83ae0dd3f1948ee04e256ed0cfa9983b1cffe548cd36d53e5def490cca752e AS final
+FROM gcr.io/iree-oss/cmake-bazel-frontends@sha256:37694fe7cf9f5624b5c09502848605f6035790c907f0b274454c3574ec1d416d AS final
ARG VULKAN_SDK_VERSION=1.2.154.0
diff --git a/build_tools/docker/cmake-bazel-frontends/Dockerfile b/build_tools/docker/cmake-bazel-frontends/Dockerfile
index ea6f827..a5b5fbd 100644
--- a/build_tools/docker/cmake-bazel-frontends/Dockerfile
+++ b/build_tools/docker/cmake-bazel-frontends/Dockerfile
@@ -12,7 +12,7 @@
&& tar --extract --gzip --file=google-research.tar.gz \
--wildcards */kws_streaming --strip-components=1
-FROM gcr.io/iree-oss/cmake-python@sha256:055eba8441ada5e0241f102241747e8d61196dca7f04316a0bfd68d2769883dc AS final
+FROM gcr.io/iree-oss/cmake-python@sha256:7e31103ee35f52e6d6019adf474bc60758710e95f20ee33ed94aee3f8780edbd AS final
# Install bazel.
COPY --from=gcr.io/iree-oss/bazel@sha256:31c3acef0aeb2976b63b8cb946bda1de9bc8b5319b7e079e507afad2a62d13e7 \
diff --git a/build_tools/docker/cmake-emscripten/Dockerfile b/build_tools/docker/cmake-emscripten/Dockerfile
index 9c5690b..dfbacdb 100644
--- a/build_tools/docker/cmake-emscripten/Dockerfile
+++ b/build_tools/docker/cmake-emscripten/Dockerfile
@@ -6,7 +6,7 @@
# An image for building IREE through Emscripten using CMake.
-FROM gcr.io/iree-oss/cmake@sha256:57ee32f8b40b727b00054be9f3359f4980aca1556740aa70c3fcfb43eedc1a4f AS final
+FROM gcr.io/iree-oss/cmake@sha256:605a514784b0415dac9f0805f01110fa13d366e26b57a89716843a252a18c563 AS final
# See also
# * https://github.com/emscripten-core/emsdk/blob/main/docker/Dockerfile
diff --git a/build_tools/docker/cmake-gcc/Dockerfile b/build_tools/docker/cmake-gcc/Dockerfile
index dac8e21..5cafd25 100644
--- a/build_tools/docker/cmake-gcc/Dockerfile
+++ b/build_tools/docker/cmake-gcc/Dockerfile
@@ -9,7 +9,7 @@
# blame me. I wasn't the one that made Dockerfile a really unextensible format.
# apparently even building the compiler requires Python now ðŸ˜
-FROM gcr.io/iree-oss/cmake-python@sha256:055eba8441ada5e0241f102241747e8d61196dca7f04316a0bfd68d2769883dc AS final
+FROM gcr.io/iree-oss/cmake-python@sha256:7e31103ee35f52e6d6019adf474bc60758710e95f20ee33ed94aee3f8780edbd AS final
ENV CC /usr/bin/gcc-9
ENV CXX /usr/bin/g++-9
diff --git a/build_tools/docker/cmake-python-nvidia/Dockerfile b/build_tools/docker/cmake-python-nvidia/Dockerfile
index fe38c61..581d1e6 100644
--- a/build_tools/docker/cmake-python-nvidia/Dockerfile
+++ b/build_tools/docker/cmake-python-nvidia/Dockerfile
@@ -36,7 +36,7 @@
# does not support Ubuntu 18.04.
# This allows to share configuration with base CMake, but it also means we need
# to MATCH the driver version between the host machine and the docker image.
-FROM gcr.io/iree-oss/cmake-python-vulkan@sha256:fae5b4ae5613551675db0af55cb8f1ec5371b2820a980a2d482dae76e1c6ee65 AS final
+FROM gcr.io/iree-oss/cmake-python-vulkan@sha256:4b50e3b4e3e11059d9c385d080f3b512fae414c2f5b36ceae72a80c6bfc0cdf1 AS final
ARG NVIDIA_COMMON_DEB
ARG NVIDIA_GL_DEB
ARG NVIDIA_COMPUTE_DEB
diff --git a/build_tools/docker/cmake-python-swiftshader/Dockerfile b/build_tools/docker/cmake-python-swiftshader/Dockerfile
index 4a9478e..3022931 100644
--- a/build_tools/docker/cmake-python-swiftshader/Dockerfile
+++ b/build_tools/docker/cmake-python-swiftshader/Dockerfile
@@ -7,8 +7,8 @@
# An image for building IREE using CMake and testing IREE with SwiftShader
# Vulkan implementation.
-FROM gcr.io/iree-oss/cmake-python-vulkan@sha256:fae5b4ae5613551675db0af55cb8f1ec5371b2820a980a2d482dae76e1c6ee65 AS final
-COPY --from=gcr.io/iree-oss/swiftshader@sha256:7f3947c8494c7a7ae92a48a219b21b5e2ef34bff339a893d0254a33f047e9e10 \
+FROM gcr.io/iree-oss/cmake-python-vulkan@sha256:4b50e3b4e3e11059d9c385d080f3b512fae414c2f5b36ceae72a80c6bfc0cdf1 AS final
+COPY --from=gcr.io/iree-oss/swiftshader@sha256:54265ebefcd6464ade8a6b36a3105f6219a2bb804c4a3b2052880fd4213d72a3 \
/swiftshader /swiftshader
# Set VK_ICD_FILENAMES so Vulkan loader can find the SwiftShader ICD.
diff --git a/build_tools/docker/cmake-python-vulkan/Dockerfile b/build_tools/docker/cmake-python-vulkan/Dockerfile
index cdaea33..954cf76 100644
--- a/build_tools/docker/cmake-python-vulkan/Dockerfile
+++ b/build_tools/docker/cmake-python-vulkan/Dockerfile
@@ -8,7 +8,7 @@
# This image provides the Vulkan SDK. Requires a child image to provide
# a Vulkan ICD.
-FROM gcr.io/iree-oss/cmake-python@sha256:055eba8441ada5e0241f102241747e8d61196dca7f04316a0bfd68d2769883dc AS final
+FROM gcr.io/iree-oss/cmake-python@sha256:7e31103ee35f52e6d6019adf474bc60758710e95f20ee33ed94aee3f8780edbd AS final
ARG VULKAN_SDK_VERSION=1.2.154.0
diff --git a/build_tools/docker/cmake-python/Dockerfile b/build_tools/docker/cmake-python/Dockerfile
index cc93175..ac94cd1 100644
--- a/build_tools/docker/cmake-python/Dockerfile
+++ b/build_tools/docker/cmake-python/Dockerfile
@@ -6,7 +6,7 @@
# An image for building IREE and its Python bindings using CMake.
-FROM gcr.io/iree-oss/cmake@sha256:57ee32f8b40b727b00054be9f3359f4980aca1556740aa70c3fcfb43eedc1a4f AS final
+FROM gcr.io/iree-oss/cmake@sha256:605a514784b0415dac9f0805f01110fa13d366e26b57a89716843a252a18c563 AS final
# Dependencies for the python bindings tests.
RUN apt-get update \
&& apt-get install -y \
diff --git a/build_tools/docker/cmake-riscv/Dockerfile b/build_tools/docker/cmake-riscv/Dockerfile
index 85f4dd3..ac18f26 100644
--- a/build_tools/docker/cmake-riscv/Dockerfile
+++ b/build_tools/docker/cmake-riscv/Dockerfile
@@ -15,7 +15,7 @@
RUN wget "https://storage.googleapis.com/iree-shared-files/qemu-riscv.tar.gz"
RUN tar -xf "qemu-riscv.tar.gz" -C /usr/src/
-FROM gcr.io/iree-oss/cmake@sha256:57ee32f8b40b727b00054be9f3359f4980aca1556740aa70c3fcfb43eedc1a4f AS final
+FROM gcr.io/iree-oss/cmake@sha256:605a514784b0415dac9f0805f01110fa13d366e26b57a89716843a252a18c563 AS final
COPY --from=install-riscv "/usr/src/toolchain_iree" "/usr/src/toolchain_iree"
COPY --from=install-riscv "/usr/src/toolchain_iree_rv32imf" "/usr/src/toolchain_iree_rv32imf"
COPY --from=install-riscv "/usr/src/qemu-riscv" "/usr/src/qemu-riscv"
diff --git a/build_tools/docker/cmake/Dockerfile b/build_tools/docker/cmake/Dockerfile
index 40abedd..d7b25c9 100644
--- a/build_tools/docker/cmake/Dockerfile
+++ b/build_tools/docker/cmake/Dockerfile
@@ -10,8 +10,8 @@
# to get the /usr/share path.
# See https://github.com/moby/moby/issues/41383
ARG CMAKE_MAJOR_VERSION=3
-ARG CMAKE_MINOR_VERSION=13
-ARG CMAKE_PATCH_VERSION=5
+ARG CMAKE_MINOR_VERSION=16
+ARG CMAKE_PATCH_VERSION=3
FROM gcr.io/iree-oss/util@sha256:40846b4aea5886af3250399d6adfdb3e1195a8b0177706bb0375e812d62dc49c AS install-cmake
ARG CMAKE_MAJOR_VERSION
diff --git a/build_tools/docker/prod_digests.txt b/build_tools/docker/prod_digests.txt
index 94e8484..a5ec718 100644
--- a/build_tools/docker/prod_digests.txt
+++ b/build_tools/docker/prod_digests.txt
@@ -1,21 +1,21 @@
gcr.io/iree-oss/base@sha256:e5ad55549adc27d5d1927b7857ff308d9b75fa1be8a110ed848b24e3816127c5
gcr.io/iree-oss/util@sha256:40846b4aea5886af3250399d6adfdb3e1195a8b0177706bb0375e812d62dc49c
-gcr.io/iree-oss/cmake@sha256:57ee32f8b40b727b00054be9f3359f4980aca1556740aa70c3fcfb43eedc1a4f
-gcr.io/iree-oss/swiftshader@sha256:7f3947c8494c7a7ae92a48a219b21b5e2ef34bff339a893d0254a33f047e9e10
-gcr.io/iree-oss/cmake-python@sha256:055eba8441ada5e0241f102241747e8d61196dca7f04316a0bfd68d2769883dc
-gcr.io/iree-oss/cmake-android@sha256:297493826856f1374bad858a106c72d03a0d9d7d0302afe4d62016e10e0ee308
+gcr.io/iree-oss/cmake@sha256:605a514784b0415dac9f0805f01110fa13d366e26b57a89716843a252a18c563
+gcr.io/iree-oss/swiftshader@sha256:54265ebefcd6464ade8a6b36a3105f6219a2bb804c4a3b2052880fd4213d72a3
+gcr.io/iree-oss/cmake-python@sha256:7e31103ee35f52e6d6019adf474bc60758710e95f20ee33ed94aee3f8780edbd
+gcr.io/iree-oss/cmake-android@sha256:478fd1790e2bcc788ca52a7e3d1e514de713e97847fc14e2d33abb05bc40a4f6
gcr.io/iree-oss/bazel@sha256:31c3acef0aeb2976b63b8cb946bda1de9bc8b5319b7e079e507afad2a62d13e7
gcr.io/iree-oss/vulkan@sha256:5812ee64806a7f3df0739ccf0930c27cabce346901488eceb1ee66c9c0a5ae96
gcr.io/iree-oss/rbe-toolchain@sha256:62b161e79413f0f59ae3845c377b10e60a4a639f3d32569a82b620f017837a68
-gcr.io/iree-oss/cmake-python-vulkan@sha256:fae5b4ae5613551675db0af55cb8f1ec5371b2820a980a2d482dae76e1c6ee65
-gcr.io/iree-oss/cmake-python-swiftshader@sha256:ea9fc25e603c4bdc9c4aeb6db8dc590df4e75ce80bf7899138505d6182241d43
-gcr.io/iree-oss/cmake-python-nvidia@sha256:90f0e35384f9218300e04c5d10c9385dd593c0dfef04eae0a44a59f6f1ca27bc
-gcr.io/iree-oss/cmake-bazel-frontends@sha256:fe83ae0dd3f1948ee04e256ed0cfa9983b1cffe548cd36d53e5def490cca752e
-gcr.io/iree-oss/cmake-bazel-frontends-vulkan@sha256:19cc43e7c57986ff4befc121389412e731c3d6a3f4d571a3a3d99c11e34d37b8
-gcr.io/iree-oss/cmake-bazel-frontends-nvidia@sha256:8e260321d94ffe5ba2222e12ec9470bb6e5da2abe258b38a4ac58781fc580593
-gcr.io/iree-oss/cmake-bazel-frontends-swiftshader@sha256:72ee80555237bc828fcb59c02374ff6c13764746adbcd3e5b9ceb107dbd7ae68
-gcr.io/iree-oss/cmake-riscv@sha256:ced0115d6dfb8a3827c77290dfb39f541b8eaab6eae1bece7eeb43a6150bb2db
-gcr.io/iree-oss/cmake-bazel-frontends-android@sha256:8ff36973858dfad252377ecd5a3a00c01876c2b83fccb91c72127d69496b84e4
-gcr.io/iree-oss/samples@sha256:7e0a025bfa9c3e6b836b505931d7e980d7f4bea451f285d52f908ac35231793e
-gcr.io/iree-oss/cmake-emscripten@sha256:d73aa7b643608e81ec253e62639ac6ec59387957509a3e894464ac8e6e8c6da8
-gcr.io/iree-oss/cmake-gcc@sha256:828a43d9d090b819445155bd0ed82fb0dd6daa4eddca705dbac8d0d8fd6a01f8
+gcr.io/iree-oss/cmake-python-vulkan@sha256:4b50e3b4e3e11059d9c385d080f3b512fae414c2f5b36ceae72a80c6bfc0cdf1
+gcr.io/iree-oss/cmake-python-swiftshader@sha256:e1f3fb0ba79f12d3dd620a84a805633ed3cb87b482758d2160b43ecf3eb9c1a9
+gcr.io/iree-oss/cmake-python-nvidia@sha256:c5efaba9a104604c240541ae513b7de876e7406ef97661e5fe6844d19d4d1e69
+gcr.io/iree-oss/cmake-bazel-frontends@sha256:37694fe7cf9f5624b5c09502848605f6035790c907f0b274454c3574ec1d416d
+gcr.io/iree-oss/cmake-bazel-frontends-vulkan@sha256:46627a46b1366be665ab2e518ad6b6f79594373db0da5af414f290f51442a45f
+gcr.io/iree-oss/cmake-bazel-frontends-nvidia@sha256:48a4a5a8449faa900ed2726e6ce2d885d23497d82ebcb21dabe3a685099e4992
+gcr.io/iree-oss/cmake-bazel-frontends-swiftshader@sha256:0629f4992d1f22722060722d03d60806dcf741ffe6376144eb5727d4ff883cca
+gcr.io/iree-oss/cmake-riscv@sha256:22a3aa7408c68188198f57b0af6bd38f364198cfd7ebade24fa09759445125cb
+gcr.io/iree-oss/cmake-bazel-frontends-android@sha256:dee6eb6c4c34a29f381bcc97ed16a76168652715794183acb703e6e08b8698a7
+gcr.io/iree-oss/samples@sha256:d9ca1dbdcf4fa2b9dd8f032b42b9a74b9b5c5210d823528ea5874dfeec13444a
+gcr.io/iree-oss/cmake-emscripten@sha256:6dd6228cd482f7bbc64bca1ee7618a55eda408148e6d6588c58e98f89780a279
+gcr.io/iree-oss/cmake-gcc@sha256:49bd84535b82012e83de15a8f1ca847076b359a7bd5a8dabda7e76abb43f32e3
diff --git a/build_tools/docker/samples/Dockerfile b/build_tools/docker/samples/Dockerfile
index 64bffc4..701134d 100644
--- a/build_tools/docker/samples/Dockerfile
+++ b/build_tools/docker/samples/Dockerfile
@@ -9,7 +9,7 @@
# * Vulkan (using SwiftShader)
# * Python (including `venv` and common pip packages needed for Colab)
-FROM gcr.io/iree-oss/cmake-python-swiftshader@sha256:ea9fc25e603c4bdc9c4aeb6db8dc590df4e75ce80bf7899138505d6182241d43 AS final
+FROM gcr.io/iree-oss/cmake-python-swiftshader@sha256:e1f3fb0ba79f12d3dd620a84a805633ed3cb87b482758d2160b43ecf3eb9c1a9 AS final
# Update setuptools per https://github.com/pypa/setuptools/issues/1694#issuecomment-466010982
RUN apt-get update && apt-get install -y python3-venv python3.7-venv python-setuptools && \
diff --git a/build_tools/docker/swiftshader/Dockerfile b/build_tools/docker/swiftshader/Dockerfile
index c295902..ba25e29 100644
--- a/build_tools/docker/swiftshader/Dockerfile
+++ b/build_tools/docker/swiftshader/Dockerfile
@@ -4,7 +4,7 @@
# See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-FROM gcr.io/iree-oss/cmake@sha256:57ee32f8b40b727b00054be9f3359f4980aca1556740aa70c3fcfb43eedc1a4f AS install-swiftshader
+FROM gcr.io/iree-oss/cmake@sha256:605a514784b0415dac9f0805f01110fa13d366e26b57a89716843a252a18c563 AS install-swiftshader
WORKDIR /install-swiftshader
RUN apt-get update && apt-get install -y git
