Create new TF 2.10 RBE config and updater config

After this is done, I'll have to run the updater to apply the changes. PiperOrigin-RevId: 449557643
galeone · May 18, 2022 · ef1364e · ef1364e
1 parent ce0662f
commit ef1364e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 7 deletions.
diff --git a/.github/workflows/update-rbe.yml b/.github/workflows/update-rbe.yml
@@ -46,11 +46,16 @@ jobs:
         # See https://github.com/tensorflow/tensorflow/blob/master/tensorflow/tools/toolchains/remote_config/configs.bzl
         # This is a mapping of name_container_map keys under sigbuild_tf_configs
         # to tag names on gcr.io/tensorflow-sigs/build.
-        map sigbuild-r2.9 latest-python3.9
-        map sigbuild-r2.9-python3.7 latest-python3.7
-        map sigbuild-r2.9-python3.8 latest-python3.8
-        map sigbuild-r2.9-python3.9 latest-python3.9
-        map sigbuild-r2.9-python3.10 latest-python3.10
+        map sigbuild-r2.9 2.9-python3.9
+        map sigbuild-r2.9-python3.7 2.9-python3.7
+        map sigbuild-r2.9-python3.8 2.9-python3.8
+        map sigbuild-r2.9-python3.9 2.9-python3.9
+        map sigbuild-r2.9-python3.10 2.9-python3.10
+        map sigbuild-r2.10 2.10-python3.9
+        map sigbuild-r2.10-python3.7 2.10-python3.7
+        map sigbuild-r2.10-python3.8 2.10-python3.8
+        map sigbuild-r2.10-python3.9 2.10-python3.9
+        map sigbuild-r2.10-python3.10 2.10-python3.10
     - name: Create Pull Request with changes
       uses: peter-evans/create-pull-request@v3
       with:

diff --git a/tensorflow/tools/toolchains/remote_config/configs.bzl b/tensorflow/tools/toolchains/remote_config/configs.bzl
@@ -313,10 +313,11 @@ def initialize_rbe_configs():
         python_bin_path = "C:/Python37/python.exe",
     )
 
-    # Experimental SIG Build RBE Config. The crosstool generated from this
-    # config is python-version-independent because it only cares about the
+    # TF-Version-Specific SIG Build RBE Configs. The crosstool generated from these
+    # configs are python-version-independent because they only care about the
     # tooling paths; the container mapping is useful only so that TF RBE users
     # may specify a specific Python version container.
+
     sigbuild_tf_configs(
         name_container_map = {
             "sigbuild-r2.9": "docker://gcr.io/tensorflow-sigs/build@sha256:2328d3d58a9591063149bfa8d5e1e10e4b3f37b7114c40535ce9b063da8c1a9a",
@@ -356,3 +357,43 @@ def initialize_rbe_configs():
             "TF_TENSORRT_VERSION": "7.2",
         },
     )
+
+    sigbuild_tf_configs(
+        name_container_map = {
+            "sigbuild-r2.10": "docker://gcr.io/tensorflow-sigs/build@sha256:2328d3d58a9591063149bfa8d5e1e10e4b3f37b7114c40535ce9b063da8c1a9a",
+            "sigbuild-r2.10-python3.7": "docker://gcr.io/tensorflow-sigs/build@sha256:592614975eb8cf39cef7df2187601a99d2f20e8d46d6fd9d6a4bf97515a1b184",
+            "sigbuild-r2.10-python3.8": "docker://gcr.io/tensorflow-sigs/build@sha256:2bdb13fbfad668f7365d5a74af9a943c90ad50e5634b5468f21db607e8678059",
+            "sigbuild-r2.10-python3.9": "docker://gcr.io/tensorflow-sigs/build@sha256:2328d3d58a9591063149bfa8d5e1e10e4b3f37b7114c40535ce9b063da8c1a9a",
+            "sigbuild-r2.10-python3.10": "docker://gcr.io/tensorflow-sigs/build@sha256:019757ec2be8bddbd9d801a8c26d9b804fe738899b38a9cd1d19bd9844cab25c",
+        },
+        # Unclear why LIBC is set to 2.19 here, and yet manylinux2010 is 2.12
+        # and manylinux2014 is 2.17.
+        env = {
+            "ABI_LIBC_VERSION": "glibc_2.19",
+            "ABI_VERSION": "gcc",
+            "BAZEL_COMPILER": "/dt9/usr/bin/gcc",
+            "BAZEL_HOST_SYSTEM": "i686-unknown-linux-gnu",
+            "BAZEL_TARGET_CPU": "k8",
+            "BAZEL_TARGET_LIBC": "glibc_2.19",
+            "BAZEL_TARGET_SYSTEM": "x86_64-unknown-linux-gnu",
+            "CC": "/dt9/usr/bin/gcc",
+            "CC_TOOLCHAIN_NAME": "linux_gnu_x86",
+            "CLEAR_CACHE": "1",
+            "CUDNN_INSTALL_PATH": "/usr/lib/x86_64-linux-gnu",
+            "GCC_HOST_COMPILER_PATH": "/dt9/usr/bin/gcc",
+            "GCC_HOST_COMPILER_PREFIX": "/usr/bin",
+            "HOST_CXX_COMPILER": "/dt9/usr/bin/gcc",
+            "HOST_C_COMPILER": "/dt9/usr/bin/gcc",
+            "PYTHON_BIN_PATH": "/usr/bin/python3",
+            "TENSORRT_INSTALL_PATH": "/usr/lib/x86_64-linux-gnu",
+            "TF_CUDA_CLANG": "0",
+            "TF_CUDA_COMPUTE_CAPABILITIES": "3.5,6.0",
+            "TF_CUDA_VERSION": "11.2",
+            "TF_CUDNN_VERSION": "8.1",
+            "TF_ENABLE_XLA": "1",
+            "TF_NEED_CUDA": "1",
+            "TF_NEED_TENSORRT": "1",
+            "TF_SYSROOT": "/dt9",
+            "TF_TENSORRT_VERSION": "7.2",
+        },
+    )