toolchains: migrate platforms to use exec_properties

- remote_execution_properties has been deprecated in favor
of exec_properties [1].

- have gpu platforms inherit from the cpu platform in order
to avoid duplication.

- Replace all uses of the exec_compatible_with attribute for
GPU tests with the exec_properties attribute. exec_properties
are passed through as platform properties to the remote
execution backend. This makes creating special platforms for
GPU tests obsolete.

[1] https://docs.bazel.build/versions/master/be/platform.html#platform.exec_properties

PiperOrigin-RevId: 292407784
Change-Id: I809354b37f4952ae73d3c4d9bfd9a9b7c14527bf

tensorflow/compiler/tests/build_defs.bzl

@@ -6,7 +6,7 @@ load("//tensorflow/compiler/tests:plugin.bzl", "plugins")
 load(
     "//tensorflow/core/platform:build_config_root.bzl",
     "tf_cuda_tests_tags",
-    "tf_exec_compatible_with",
+    "tf_exec_properties",
 )
 
 def all_backends():
@@ -113,7 +113,7 @@ def tf_xla_py_test(
             data = data + backend_data,
             deps = deps + backend_deps,
             tags = test_tags,
-            exec_compatible_with = tf_exec_compatible_with({"tags": test_tags}),
+            exec_properties = tf_exec_properties({"tags": test_tags}),
             **kwargs
         )
         test_names.append(test_name)

tensorflow/core/platform/build_config_root.bzl

@@ -11,7 +11,7 @@ load(
     _tf_additional_plugin_deps = "tf_additional_plugin_deps",
     _tf_additional_xla_deps_py = "tf_additional_xla_deps_py",
     _tf_cuda_tests_tags = "tf_cuda_tests_tags",
-    _tf_exec_compatible_with = "tf_exec_compatible_with",
+    _tf_exec_properties = "tf_exec_properties",
     _tf_gpu_tests_tags = "tf_gpu_tests_tags",
     _tf_sycl_tests_tags = "tf_sycl_tests_tags",
 )
@@ -25,6 +25,6 @@ tf_additional_license_deps = _tf_additional_license_deps
 tf_additional_plugin_deps = _tf_additional_plugin_deps
 tf_additional_xla_deps_py = _tf_additional_xla_deps_py
 tf_cuda_tests_tags = _tf_cuda_tests_tags
-tf_exec_compatible_with = _tf_exec_compatible_with
+tf_exec_properties = _tf_exec_properties
 tf_gpu_tests_tags = _tf_gpu_tests_tags
 tf_sycl_tests_tags = _tf_sycl_tests_tags

tensorflow/core/platform/default/build_config_root.bzl

@@ -4,6 +4,13 @@
 
 load("@local_config_remote_execution//:remote_execution.bzl", "gpu_test_tags")
 
+# RBE settings for tests that require a GPU. This is used in exec_properties of rules
+# that need GPU access.
+GPU_TEST_PROPERTIES = {
+    "dockerRuntime": "nvidia",
+    "Pool": "gpu-pool",
+}
+
 def tf_gpu_tests_tags():
     return ["requires-gpu", "gpu"] + gpu_test_tags()
 
@@ -14,11 +21,11 @@ def tf_cuda_tests_tags():
 def tf_sycl_tests_tags():
     return ["requires-gpu", "gpu"] + gpu_test_tags()
 
-def tf_exec_compatible_with(kwargs):
+def tf_exec_properties(kwargs):
     if ("tags" in kwargs and kwargs["tags"] != None and
         "remote-gpu" in kwargs["tags"]):
-        return ["@org_tensorflow//third_party/toolchains:gpu_test"]
+        return GPU_TEST_PROPERTIES
-    return []
+    return {}
 
 def tf_additional_plugin_deps():
     return select({

tensorflow/examples/adding_an_op/BUILD

@@ -4,7 +4,7 @@
 load(
     "//tensorflow/core/platform:build_config_root.bzl",
     "tf_cuda_tests_tags",
-    "tf_exec_compatible_with",
+    "tf_exec_properties",
 )
 load("//tensorflow:tensorflow.bzl", "tf_custom_op_library")
 load("//tensorflow:tensorflow.bzl", "tf_cc_binary")
@@ -133,7 +133,7 @@ py_test(
     name = "cuda_op_test",
     size = "small",
     srcs = ["cuda_op_test.py"],
-    exec_compatible_with = tf_exec_compatible_with({"tags": tf_cuda_tests_tags()}),
+    exec_properties = tf_exec_properties({"tags": tf_cuda_tests_tags()}),
     python_version = "PY3",
     srcs_version = "PY2AND3",
     tags = tf_cuda_tests_tags() + [

tensorflow/tensorflow.bzl

@@ -7,7 +7,7 @@ load(
     "register_extension_info",
     "tf_additional_grpc_deps_py",
     "tf_additional_xla_deps_py",
-    "tf_exec_compatible_with",
+    "tf_exec_properties",
     "tf_gpu_tests_tags",
     "tf_sycl_tests_tags",
 )
@@ -1027,7 +1027,7 @@ def tf_cc_test(
         data = data +
                tf_binary_dynamic_kernel_dsos() +
                tf_binary_additional_srcs(),
-        exec_compatible_with = tf_exec_compatible_with(kwargs),
+        exec_properties = tf_exec_properties(kwargs),
         # Nested select() statements seem not to be supported when passed to
         # linkstatic, and we already have a cuda select() passed in to this
         # function.
@@ -1175,7 +1175,7 @@ def tf_gpu_only_cc_test(
             "//conditions:default": 0,
         }),
         tags = tags,
-        exec_compatible_with = tf_exec_compatible_with({"tags": tags}),
+        exec_properties = tf_exec_properties({"tags": tags}),
     )
 
 register_extension_info(
@@ -1262,7 +1262,7 @@ def tf_cc_test_mkl(
             }) + _rpath_linkopts(src_to_test_name(src)),
             deps = deps + tf_binary_dynamic_kernel_deps(kernels) + mkl_deps(),
             data = data + tf_binary_dynamic_kernel_dsos(),
-            exec_compatible_with = tf_exec_compatible_with({"tags": tags}),
+            exec_properties = tf_exec_properties({"tags": tags}),
             linkstatic = linkstatic,
             tags = tags,
             size = size,
@@ -2101,7 +2101,7 @@ def py_test(deps = [], data = [], kernels = [], **kwargs):
             "//conditions:default": kernels,
             clean_dep("//tensorflow:no_tensorflow_py_deps"): ["//tensorflow/tools/pip_package:win_pip_package_marker"],
         }),
-        exec_compatible_with = tf_exec_compatible_with(kwargs),
+        exec_properties = tf_exec_properties(kwargs),
         **kwargs
     )
 

tensorflow/tools/ci_build/presubmit/ubuntu_16/cpu_py36_full/build.sh

@@ -70,7 +70,7 @@ function run_build () {
     --copt=-mavx \
     --linkopt=-lrt \
     --distinct_host_configuration=false \
-    --remote_default_platform_properties="properties:{name:\"build\" value:\"${CACHE_SILO_VAL}\"}" \
+    --remote_default_exec_properties=build=${CACHE_SILO_VAL} \
     --crosstool_top=//third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010:toolchain \
     --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8 \
     --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8 \

tensorflow/tools/ci_build/presubmit/ubuntu_16/gpu_py36_full/build.sh

@@ -88,14 +88,14 @@ function run_build () {
     --linkopt=-lrt \
     --linkopt=-lm \
     --distinct_host_configuration=false \
-    --remote_default_platform_properties="properties:{name:\"build\" value:\"${CACHE_SILO_VAL}\"}" \
+    --remote_default_exec_properties=build=${CACHE_SILO_VAL} \
     --crosstool_top=//third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0:toolchain \
     --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.1:jdk8 \
     --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/1.0:jdk8 \
     --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 \
     --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8 \
     --extra_toolchains=//third_party/toolchains/preconfig/ubuntu16.04/gcc7_manylinux2010-nvcc-cuda10.0:toolchain-linux-x86_64 \
-    --extra_execution_platforms=@org_tensorflow//third_party/toolchains:rbe_cuda10.0-cudnn7-ubuntu16.04-manylinux2010,@org_tensorflow//third_party/toolchains:rbe_cuda10.0-cudnn7-ubuntu16.04-manylinux2010-gpu \
+    --extra_execution_platforms=@org_tensorflow//third_party/toolchains:rbe_cuda10.0-cudnn7-ubuntu16.04-manylinux2010 \
     --host_platform=@org_tensorflow//third_party/toolchains:rbe_cuda10.0-cudnn7-ubuntu16.04-manylinux2010 \
     --local_test_jobs=4 \
     --remote_timeout=3600 \

tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh

@@ -28,7 +28,7 @@ function run_configure_for_gpu_build {
 
 function set_remote_cache_options {
   echo "build --remote_instance_name=projects/tensorflow-testing/instances/default_instance" >> "${TMP_BAZELRC}"
-  echo "build --remote_default_platform_properties='properties:{name:\"build\" value:\"windows-x64\"}'" >> "${TMP_BAZELRC}"
+  echo "build --remote_default_exec_properties=build=windows-x64" >> "${TMP_BAZELRC}"
   echo "build --remote_cache=remotebuildexecution.googleapis.com" >> "${TMP_BAZELRC}"
   echo "build --tls_enabled=true" >> "${TMP_BAZELRC}"
   echo "build --remote_timeout=3600" >> "${TMP_BAZELRC}"

third_party/toolchains/BUILD

@@ -4,17 +4,6 @@ package(default_visibility = ["//visibility:public"])
 
 load("//third_party/toolchains/preconfig/generate:containers.bzl", "container_digests")
 
-# Constraint used for platforms below so we can force certain rules to be executed
-# on specific platforms.
-constraint_setting(name = "custom_platforms")
-
-# Constraint for platforms that allow GPU testing (i.e. have a GPU available).
-# This is used in exec_compatible_with of rules that need GPU access.
-constraint_value(
-    name = "gpu_test",
-    constraint_setting = ":custom_platforms",
-)
-
 # Remote build platforms.
 # Each of the platform rules here provide a platform definition that is bound to a docker image.
 # The result of the skylark configuration is checked into
@@ -27,16 +16,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-ubuntu16.04@%s" % container_digests["ubuntu16.04"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-ubuntu16.04@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["ubuntu16.04"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.cpu-centos6.
@@ -46,16 +29,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-centos6@%s" % container_digests["centos6"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-centos6@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["centos6"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu14.04.
@@ -65,40 +42,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-ubuntu14.04@%s" % container_digests["cuda10.0-cudnn7-ubuntu14.04"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-ubuntu14.04@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["cuda10.0-cudnn7-ubuntu14.04"],
-)
-
-# The above platform with GPU support.
-platform(
-    name = "rbe_cuda10.0-cudnn7-ubuntu14.04-gpu",
-    constraint_values = [
-        "@bazel_tools//platforms:x86_64",
-        "@bazel_tools//platforms:linux",
-        ":gpu_test",
-    ],
-    remote_execution_properties = """
-        properties: {
-            name: "container-image"
-            value: "docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-ubuntu14.04@%s"
-        }
-        properties: {
-            name: "dockerRuntime"
-            value: "nvidia"
-        }
-        properties: {
-            name: "Pool"
-            value: "gpu-pool"
-        }
-        """ % container_digests["cuda10.0-cudnn7-ubuntu14.04"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-centos6.
@@ -108,40 +55,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-centos6@%s" % container_digests["cuda10.0-cudnn7-centos6"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-centos6@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["cuda10.0-cudnn7-centos6"],
-)
-
-# The above platform with GPU support.
-platform(
-    name = "rbe_cuda10.0-cudnn7-centos6-gpu",
-    constraint_values = [
-        "@bazel_tools//platforms:x86_64",
-        "@bazel_tools//platforms:linux",
-        ":gpu_test",
-    ],
-    remote_execution_properties = """
-        properties: {
-            name: "container-image"
-            value: "docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-centos6@%s"
-        }
-        properties: {
-            name: "dockerRuntime"
-            value: "nvidia"
-        }
-        properties: {
-            name: "Pool"
-            value: "gpu-pool"
-        }
-        """ % container_digests["cuda10.0-cudnn7-centos6"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.ubuntu16.04-manylinux2010.
@@ -151,16 +68,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-ubuntu16.04-manylinux2010@%s" % container_digests["ubuntu16.04-manylinux2010"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-ubuntu16.04-manylinux2010@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["ubuntu16.04-manylinux2010"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.0-cudnn7-ubuntu16.04-manylinux2010.
@@ -170,40 +81,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-ubuntu16.04-manylinux2010@%s" % container_digests["cuda10.0-cudnn7-ubuntu16.04-manylinux2010"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-ubuntu16.04-manylinux2010@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["cuda10.0-cudnn7-ubuntu16.04-manylinux2010"],
-)
-
-# The above platform with GPU support.
-platform(
-    name = "rbe_cuda10.0-cudnn7-ubuntu16.04-manylinux2010-gpu",
-    constraint_values = [
-        "@bazel_tools//platforms:x86_64",
-        "@bazel_tools//platforms:linux",
-        ":gpu_test",
-    ],
-    remote_execution_properties = """
-        properties: {
-            name: "container-image"
-            value: "docker://gcr.io/tensorflow-testing/nosla-cuda10.0-cudnn7-ubuntu16.04-manylinux2010@%s"
-        }
-        properties: {
-            name: "dockerRuntime"
-            value: "nvidia"
-        }
-        properties: {
-            name: "Pool"
-            value: "gpu-pool"
-        }
-        """ % container_digests["cuda10.0-cudnn7-ubuntu16.04-manylinux2010"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.cuda10.1-cudnn7-ubuntu16.04-manylinux2010.
@@ -213,40 +94,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-cuda10.1-cudnn7-ubuntu16.04-manylinux2010@%s" % container_digests["cuda10.1-cudnn7-ubuntu16.04-manylinux2010"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-cuda10.1-cudnn7-ubuntu16.04-manylinux2010@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["cuda10.1-cudnn7-ubuntu16.04-manylinux2010"],
-)
-
-# The above platform with GPU support.
-platform(
-    name = "rbe_cuda10.1-cudnn7-ubuntu16.04-manylinux2010-gpu",
-    constraint_values = [
-        "@bazel_tools//platforms:x86_64",
-        "@bazel_tools//platforms:linux",
-        ":gpu_test",
-    ],
-    remote_execution_properties = """
-        properties: {
-            name: "container-image"
-            value: "docker://gcr.io/tensorflow-testing/nosla-cuda10.1-cudnn7-ubuntu16.04-manylinux2010@%s"
-        }
-        properties: {
-            name: "dockerRuntime"
-            value: "nvidia"
-        }
-        properties: {
-            name: "Pool"
-            value: "gpu-pool"
-        }
-        """ % container_digests["cuda10.1-cudnn7-ubuntu16.04-manylinux2010"],
 )
 
 # Built with //tensorflow/tools/ci_build/Dockerfile.rbe.rocm-ubuntu16.04
@@ -256,14 +107,8 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:linux",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties: {
+        "container-image": "docker://gcr.io/tensorflow-testing/nosla-rocm-ubuntu16.04@%s" % container_digests["rocm-ubuntu16.04"],
-            name: "container-image"
+        "Pool": "default",
-            value:"docker://gcr.io/tensorflow-testing/nosla-rocm-ubuntu16.04@%s"
+    },
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """ % container_digests["rocm-ubuntu16.04"],
 )

third_party/toolchains/preconfig/win_1803/BUILD

@@ -14,15 +14,10 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:windows",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties:{
+        "container-image": "docker://gcr.io/tensorflow-testing/tf-win-rbe@sha256:f109576c7c0c8a1783ff22b666e8923b52dbbe7933f69a1c7a7275202c304a12",
-          name:"container-image"
+        "OSFamily": "Windows",
-          value:"docker://gcr.io/tensorflow-testing/tf-win-rbe@sha256:f109576c7c0c8a1783ff22b666e8923b52dbbe7933f69a1c7a7275202c304a12"
+    },
-        }
-        properties:{
-          name: "OSFamily" value: "Windows"
-        }
-        """,
 )
 
 platform(
@@ -31,17 +26,9 @@ platform(
         "@bazel_tools//platforms:x86_64",
         "@bazel_tools//platforms:windows",
     ],
-    remote_execution_properties = """
+    exec_properties = {
-        properties:{
+        "container-image": "",
-          name:"container-image"
+        "sandbox": "none",
-          value:""
+        "OSFamily": "Windows",
-        }
+    },
-        properties:{
-          name:"sandbox"
-          value:"none"
-        }
-        properties:{
-          name: "OSFamily" value: "Windows"
-        }
-        """,
 )