Update the Windows Docker CI image to include the C++ ATL library.

PiperOrigin-RevId: 705651893
openxla · Dec 12, 2024 · cb6562b · cb6562b
1 parent ebc8a58
commit cb6562b
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 106 deletions.
diff --git a/third_party/tsl/tools/toolchains/win/20240424/BUILD b/third_party/tsl/tools/toolchains/win/20240424/BUILD
diff --git a/third_party/tsl/tools/toolchains/win/20240424/builtin_include_directory_paths_clangcl b/third_party/tsl/tools/toolchains/win/20240424/builtin_include_directory_paths_clangcl
@@ -3,3 +3,5 @@ that clang-cl reported. This file is a dependency of every compilation action an
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
+
+
diff --git a/third_party/tsl/tools/toolchains/win/20240424/builtin_include_directory_paths_msvc b/third_party/tsl/tools/toolchains/win/20240424/builtin_include_directory_paths_msvc
@@ -4,3 +4,4 @@ changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
+
diff --git a/third_party/tsl/tools/toolchains/win/20240424/toolchain_image_info b/third_party/tsl/tools/toolchains/win/20240424/toolchain_image_info
@@ -1,2 +1,2 @@
 REPOSITORY                                            TAG                 DIGEST                                                                    IMAGE ID            CREATED             SIZE
-gcr.io/tensorflow-testing/tf-win2019-docker-staging   latest              sha256:1082ef4299a72e44a84388f192ecefc81ec9091c146f507bc36070c089c0edcc   b601adb43430        8 minutes ago       20.4GB
+gcr.io/tensorflow-testing/tf-win2019-rbe   latest              sha256:d3577d20dea75966faf7fd03479c71462441937df5694259109c2ee1d002a3dd   b601adb43430        8 minutes ago       20.4GB
diff --git a/third_party/tsl/tools/toolchains/win/20240424/windows_cc_toolchain_config.bzl b/third_party/tsl/tools/toolchains/win/20240424/windows_cc_toolchain_config.bzl
@@ -375,7 +375,6 @@ def _impl(ctx):
 
         compiler_param_file_feature = feature(
             name = "compiler_param_file",
-            enabled = True,
         )
 
         copy_dynamic_libraries_to_binary_feature = feature(

diff --git a/third_party/tsl/tools/toolchains/win/BUILD b/third_party/tsl/tools/toolchains/win/BUILD
@@ -17,7 +17,7 @@ platform(
     remote_execution_properties = """
         properties:{
           name: "container-image"
-          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:1082ef4299a72e44a84388f192ecefc81ec9091c146f507bc36070c089c0edcc"
+          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:d3577d20dea75966faf7fd03479c71462441937df5694259109c2ee1d002a3dd"
         }
         properties:{
           name: "OSFamily"
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties:{
           name: "container-image"
-          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:1082ef4299a72e44a84388f192ecefc81ec9091c146f507bc36070c089c0edcc"
+          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:d3577d20dea75966faf7fd03479c71462441937df5694259109c2ee1d002a3dd"
         }
         properties:{
           name: "OSFamily"

diff --git a/tools/toolchains/win/20240424/BUILD b/tools/toolchains/win/20240424/BUILD
diff --git a/tools/toolchains/win/20240424/builtin_include_directory_paths_clangcl b/tools/toolchains/win/20240424/builtin_include_directory_paths_clangcl
@@ -3,3 +3,5 @@ that clang-cl reported. This file is a dependency of every compilation action an
 changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
+
+
diff --git a/tools/toolchains/win/20240424/builtin_include_directory_paths_msvc b/tools/toolchains/win/20240424/builtin_include_directory_paths_msvc
@@ -4,3 +4,4 @@ changes to it will be reflected in the action cache key. When some of these
 paths change, Bazel will make sure to rerun the action, even though none of
 declared action inputs or the action commandline changes.
 
+
diff --git a/tools/toolchains/win/20240424/toolchain_image_info b/tools/toolchains/win/20240424/toolchain_image_info
@@ -1,2 +1,2 @@
 REPOSITORY                                            TAG                 DIGEST                                                                    IMAGE ID            CREATED             SIZE
-gcr.io/tensorflow-testing/tf-win2019-docker-staging   latest              sha256:1082ef4299a72e44a84388f192ecefc81ec9091c146f507bc36070c089c0edcc   b601adb43430        8 minutes ago       20.4GB
+gcr.io/tensorflow-testing/tf-win2019-rbe   latest              sha256:d3577d20dea75966faf7fd03479c71462441937df5694259109c2ee1d002a3dd   b601adb43430        8 minutes ago       20.4GB
diff --git a/tools/toolchains/win/20240424/windows_cc_toolchain_config.bzl b/tools/toolchains/win/20240424/windows_cc_toolchain_config.bzl
@@ -375,7 +375,6 @@ def _impl(ctx):
 
         compiler_param_file_feature = feature(
             name = "compiler_param_file",
-            enabled = True,
         )
 
         copy_dynamic_libraries_to_binary_feature = feature(

diff --git a/tools/toolchains/win/BUILD b/tools/toolchains/win/BUILD
@@ -17,7 +17,7 @@ platform(
     remote_execution_properties = """
         properties:{
           name: "container-image"
-          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:1082ef4299a72e44a84388f192ecefc81ec9091c146f507bc36070c089c0edcc"
+          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:d3577d20dea75966faf7fd03479c71462441937df5694259109c2ee1d002a3dd"
         }
         properties:{
           name: "OSFamily"
@@ -43,7 +43,7 @@ platform(
     remote_execution_properties = """
         properties:{
           name: "container-image"
-          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:1082ef4299a72e44a84388f192ecefc81ec9091c146f507bc36070c089c0edcc"
+          value: "docker://gcr.io/tensorflow-testing/tf-win2019-rbe@sha256:d3577d20dea75966faf7fd03479c71462441937df5694259109c2ee1d002a3dd"
         }
         properties:{
           name: "OSFamily"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,5 @@ that clang-cl reported. This file is a dependency of every compilation action an
		changes to it will be reflected in the action cache key. When some of these
		paths change, Bazel will make sure to rerun the action, even though none of
		declared action inputs or the action commandline changes.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ changes to it will be reflected in the action cache key. When some of these
		paths change, Bazel will make sure to rerun the action, even though none of
		declared action inputs or the action commandline changes.