diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2acb0341a89ae..e95e46eb81fed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -239,7 +239,7 @@ jobs: run: | ./build_tools/github_actions/docker_run.sh \ --env "IREE_WRITE_REMOTE_BAZEL_CACHE=${IREE_WRITE_REMOTE_BAZEL_CACHE}" \ - gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:89656f131eb6efc97585f6b71b2cedbaa9ae79b539362d2545b19a9bbaf7501c \ + gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:d2483ac643184a16942489d8f709ef3714543ae795fa9ae8fd2e4d8bf68a24a0 \ ./build_tools/bazel/build_core.sh test_all: @@ -268,7 +268,7 @@ jobs: run: | ./build_tools/github_actions/docker_run.sh \ --env IREE_CUDA_DISABLE=1 \ - gcr.io/iree-oss/swiftshader@sha256:e9501304b0a19acfae4a1295dca78f24c839975f25e3c2d434b92c0b5e5f5c5d \ + gcr.io/iree-oss/swiftshader@sha256:035ac89d3c357787052a836f4cbd227035260c05c95fa9a53d809600c454e819 \ ./build_tools/cmake/ctest_all.sh \ "${BUILD_DIR}" @@ -485,7 +485,7 @@ jobs: run: | ./build_tools/github_actions/docker_run.sh \ --env IREE_VMVX_DISABLE=0 \ - gcr.io/iree-oss/frontends-swiftshader@sha256:c3f171feac512e2491c1ac96ef8a1290014d11114ea7eac94b191f8245e25abe \ + gcr.io/iree-oss/frontends-swiftshader@sha256:4b74c16cb3cda0b748bb3562a489da10cd637ca07a56a81bff0d75690f6c3d5b \ build_tools/cmake/run_tf_tests.sh \ "${BUILD_DIR}" @@ -591,7 +591,7 @@ jobs: --env "IREE_CCACHE_GCP_TOKEN=$(gcloud auth application-default print-access-token)" \ --env "IREE_WRITE_REMOTE_CCACHE=${IREE_WRITE_REMOTE_CCACHE}" \ --env "CCACHE_NAMESPACE=swiftshader-bleeding-edge@sha256:c22afc61198e14a98e06e5261149de74c629acd2bc61b82e57ec90e5461b69be" \ - gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:89656f131eb6efc97585f6b71b2cedbaa9ae79b539362d2545b19a9bbaf7501c \ + gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:d2483ac643184a16942489d8f709ef3714543ae795fa9ae8fd2e4d8bf68a24a0 \ ./build_tools/cmake/build_and_test_asan.sh tsan: diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml index 95d31d314b82a..e5f49db160fec 100644 --- a/.github/workflows/samples.yml +++ b/.github/workflows/samples.yml @@ -32,7 +32,7 @@ jobs: - name: "Testing Colab Notebooks" run: | ./build_tools/github_actions/docker_run.sh \ - gcr.io/iree-oss/samples@sha256:a1ac01746d4dde6959499ad6fc5e811fb286b606a2a1f48500d58c48e351fac6 \ + gcr.io/iree-oss/samples@sha256:c1312188958a58d464079651061311e5fb0e77a44ad19239b5c244ed2bf5b027 \ ./samples/colab/test_notebooks.py samples: @@ -43,7 +43,7 @@ jobs: - name: "Testing Samples" run: | ./build_tools/github_actions/docker_run.sh \ - gcr.io/iree-oss/samples@sha256:a1ac01746d4dde6959499ad6fc5e811fb286b606a2a1f48500d58c48e351fac6 \ + gcr.io/iree-oss/samples@sha256:c1312188958a58d464079651061311e5fb0e77a44ad19239b5c244ed2bf5b027 \ ./build_tools/testing/test_samples.sh # FIXME: unify this with host build from ci.yml. This is complicated by diff --git a/build_tools/bazel/iree.bazelrc b/build_tools/bazel/iree.bazelrc index 5d2f31c69403b..1b9920e9d3e22 100644 --- a/build_tools/bazel/iree.bazelrc +++ b/build_tools/bazel/iree.bazelrc @@ -277,7 +277,7 @@ build:remote_cache_bazel_ci --config=_remote_cache_base # specific docker container the CI Bazel builds are run in. The image URL is # included for clarity and so that this reference is automatically updated by # manage_images.py -build:remote_cache_bazel_ci --host_platform_remote_properties_override='properties:{name:"cache-silo-key" value:"gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:89656f131eb6efc97585f6b71b2cedbaa9ae79b539362d2545b19a9bbaf7501c"}' +build:remote_cache_bazel_ci --host_platform_remote_properties_override='properties:{name:"cache-silo-key" value:"gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:d2483ac643184a16942489d8f709ef3714543ae795fa9ae8fd2e4d8bf68a24a0"}' ############################################################################### diff --git a/build_tools/docker/dockerfiles/frontends-swiftshader.Dockerfile b/build_tools/docker/dockerfiles/frontends-swiftshader.Dockerfile index c9090c21cb080..ba2eb68fee8a5 100644 --- a/build_tools/docker/dockerfiles/frontends-swiftshader.Dockerfile +++ b/build_tools/docker/dockerfiles/frontends-swiftshader.Dockerfile @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception FROM gcr.io/iree-oss/frontends@sha256:7ecfdda9ef9f64cfa12b1ed203992abab8057ba350ec8c2b7bf63d7dd8f160fc -COPY --from=gcr.io/iree-oss/swiftshader@sha256:e9501304b0a19acfae4a1295dca78f24c839975f25e3c2d434b92c0b5e5f5c5d \ +COPY --from=gcr.io/iree-oss/swiftshader@sha256:035ac89d3c357787052a836f4cbd227035260c05c95fa9a53d809600c454e819 \ /swiftshader /swiftshader # Set VK_ICD_FILENAMES so Vulkan loader can find the SwiftShader ICD. diff --git a/build_tools/docker/dockerfiles/samples.Dockerfile b/build_tools/docker/dockerfiles/samples.Dockerfile index 194713e1d6cba..cb8e586afb0e0 100644 --- a/build_tools/docker/dockerfiles/samples.Dockerfile +++ b/build_tools/docker/dockerfiles/samples.Dockerfile @@ -9,7 +9,7 @@ # * Vulkan (using SwiftShader) # * Python (including `venv` and common pip packages needed for Colab) -FROM gcr.io/iree-oss/swiftshader@sha256:e9501304b0a19acfae4a1295dca78f24c839975f25e3c2d434b92c0b5e5f5c5d +FROM gcr.io/iree-oss/swiftshader@sha256:035ac89d3c357787052a836f4cbd227035260c05c95fa9a53d809600c454e819 # Install additional packages often used in notebooks. # Installing these at the system level helps with caching, since venvs can diff --git a/build_tools/docker/prod_digests.txt b/build_tools/docker/prod_digests.txt index d01882cf1ecd6..788e36ae23222 100644 --- a/build_tools/docker/prod_digests.txt +++ b/build_tools/docker/prod_digests.txt @@ -1,9 +1,9 @@ gcr.io/iree-oss/base@sha256:796fb81a11ff7e7d057c93de468b74e48b6a9641aa19b7f7673c2772e8ea3b33 -gcr.io/iree-oss/swiftshader@sha256:e9501304b0a19acfae4a1295dca78f24c839975f25e3c2d434b92c0b5e5f5c5d -gcr.io/iree-oss/samples@sha256:a1ac01746d4dde6959499ad6fc5e811fb286b606a2a1f48500d58c48e351fac6 +gcr.io/iree-oss/swiftshader@sha256:035ac89d3c357787052a836f4cbd227035260c05c95fa9a53d809600c454e819 +gcr.io/iree-oss/samples@sha256:c1312188958a58d464079651061311e5fb0e77a44ad19239b5c244ed2bf5b027 gcr.io/iree-oss/frontends@sha256:7ecfdda9ef9f64cfa12b1ed203992abab8057ba350ec8c2b7bf63d7dd8f160fc gcr.io/iree-oss/frontends-nvidia@sha256:0451c9e93c2d938c08b767e2deb1870fdf98060a1b01685cbacbf3f50e677fc5 -gcr.io/iree-oss/frontends-swiftshader@sha256:c3f171feac512e2491c1ac96ef8a1290014d11114ea7eac94b191f8245e25abe +gcr.io/iree-oss/frontends-swiftshader@sha256:4b74c16cb3cda0b748bb3562a489da10cd637ca07a56a81bff0d75690f6c3d5b gcr.io/iree-oss/gradle-android@sha256:cf7bf0392d5125f2babb4b9de4b43b583220506ecebd6b6201b23b2575f671c0 gcr.io/iree-oss/riscv@sha256:e3b68a91018ada9d1cb3829a1de846e8d737e1575c528cea5a21a770bd02d2a7 gcr.io/iree-oss/nvidia@sha256:4e814f5f3bac53c88b64f0fe89af9f3dcc43bcf8610ea8b4511e21015ad1fb9c @@ -12,7 +12,7 @@ gcr.io/iree-oss/android@sha256:d349a3d137d0ed0f7360af16096db682da0233679cdbb00a3 gcr.io/iree-oss/manylinux2014_x86_64-release@sha256:e83893d35be4ce3558c989e9d5ccc4ff88d058bc3e74a83181059cc76e2cf1f8 gcr.io/iree-oss/shark@sha256:2b2e41dbf909194b598e226144a2fb1e74d31851d41fe519d0fcb6d071b77461 gcr.io/iree-oss/base-bleeding-edge@sha256:14200dacca3a0f3a66f8aa87c6f64729b83a2eeb403b689c24204074ad157418 -gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:89656f131eb6efc97585f6b71b2cedbaa9ae79b539362d2545b19a9bbaf7501c +gcr.io/iree-oss/swiftshader-bleeding-edge@sha256:d2483ac643184a16942489d8f709ef3714543ae795fa9ae8fd2e4d8bf68a24a0 gcr.io/iree-oss/mmperf@sha256:dfeebcaf8f417275d44c7b8d9a1360c6a26d280b526779c9e64384798cfd9c92 gcr.io/iree-oss/convperf@sha256:8e242ad71896a791c9be53b0906b7c8e96a2d3bad3f7431622cc797a6f89ba0f gcr.io/iree-oss/perf@sha256:0e1c92dde6ec7312c7c92a8ee329892ad83bae4b7968e4f2c98f99ffad3faa48 diff --git a/build_tools/scripts/integrate/README.md b/build_tools/scripts/integrate/README.md index 7c0103df7d746..d5cadc1a196c1 100644 --- a/build_tools/scripts/integrate/README.md +++ b/build_tools/scripts/integrate/README.md @@ -246,8 +246,8 @@ under docker, we can find the hash from CI log. An example from a log: ``` -[18:30:23 UTC] docker run --volume=/tmpfs/src/github/iree:/tmpfs/src/github/iree --workdir=/tmpfs/src/github/iree --rm --user=1003:1004 --volume=/tmpfs/fake_etc/group:/etc/group:ro --volume=/tmpfs/fake_etc/passwd:/etc/passwd:ro --volume=/tmpfs/fake_home:/home/kbuilder --volume=/home/kbuilder/.config/gcloud:/home/kbuilder/.config/gcloud:ro gcr.io/iree-oss/frontends-swiftshader@sha256:c3f171feac512e2491c1ac96ef8a1290014d11114ea7eac94b191f8245e25abe build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build.sh -Unable to find image 'gcr.io/iree-oss/frontends-swiftshader@sha256:c3f171feac512e2491c1ac96ef8a1290014d11114ea7eac94b191f8245e25abe' locally +[18:30:23 UTC] docker run --volume=/tmpfs/src/github/iree:/tmpfs/src/github/iree --workdir=/tmpfs/src/github/iree --rm --user=1003:1004 --volume=/tmpfs/fake_etc/group:/etc/group:ro --volume=/tmpfs/fake_etc/passwd:/etc/passwd:ro --volume=/tmpfs/fake_home:/home/kbuilder --volume=/home/kbuilder/.config/gcloud:/home/kbuilder/.config/gcloud:ro gcr.io/iree-oss/frontends-swiftshader@sha256:4b74c16cb3cda0b748bb3562a489da10cd637ca07a56a81bff0d75690f6c3d5b build_tools/kokoro/gcp_ubuntu/bazel/linux/x86-swiftshader/core/build.sh +Unable to find image 'gcr.io/iree-oss/frontends-swiftshader@sha256:4b74c16cb3cda0b748bb3562a489da10cd637ca07a56a81bff0d75690f6c3d5b' locally sha256:aeb8de9fb7af3913d385ec6b274320197d61aa7bc51a6e8bc0deba644da3e405: Pulling from iree-oss/frontends-swiftshader ``` @@ -255,7 +255,7 @@ You can find the hash tag from log and run the below command. It makes sure that you have the enviroment as same as CI bot and requires less local setup. ``` -docker run --interactive --tty --rm --volume=$PWD:/src/iree --workdir=/src/iree gcr.io/iree-oss/frontends-swiftshader@sha256:c3f171feac512e2491c1ac96ef8a1290014d11114ea7eac94b191f8245e25abe +docker run --interactive --tty --rm --volume=$PWD:/src/iree --workdir=/src/iree gcr.io/iree-oss/frontends-swiftshader@sha256:4b74c16cb3cda0b748bb3562a489da10cd637ca07a56a81bff0d75690f6c3d5b ``` To repro failures in `iree/e2e/`: diff --git a/build_tools/third_party/swiftshader/build_vk_swiftshader.sh b/build_tools/third_party/swiftshader/build_vk_swiftshader.sh index 2d209cc66a6a5..be6e936d6c78a 100755 --- a/build_tools/third_party/swiftshader/build_vk_swiftshader.sh +++ b/build_tools/third_party/swiftshader/build_vk_swiftshader.sh @@ -47,7 +47,7 @@ set -e # This isn't an argument so that we can set the swiftshader commit in one place # for the whole project. -SWIFTSHADER_COMMIT=dd7bb92b9a7a813ebc2da9fe3f6484c34cc69363 +SWIFTSHADER_COMMIT=32f9332d1d7aacbdba7c1aa5df894bb1890bb2cc SWIFTSHADER_SRC_DIR="$(mktemp --directory --tmpdir swiftshader_src_XXXXXX)" SWIFTSHADER_BUILD_DIR="$(mktemp --directory --tmpdir swiftshader_build_XXXXXX)"