diff --git a/tensorflow/core/platform/build_config_root.bzl b/tensorflow/core/platform/build_config_root.bzl index b82e1041695..eea50174b38 100644 --- a/tensorflow/core/platform/build_config_root.bzl +++ b/tensorflow/core/platform/build_config_root.bzl @@ -5,7 +5,6 @@ load( _if_dynamic_kernels = "if_dynamic_kernels", _if_static = "if_static", _if_static_and_not_mobile = "if_static_and_not_mobile", - _register_extension_info = "register_extension_info", _tf_additional_grpc_deps_py = "tf_additional_grpc_deps_py", _tf_additional_license_deps = "tf_additional_license_deps", _tf_additional_plugin_deps = "tf_additional_plugin_deps", @@ -19,7 +18,6 @@ load( if_dynamic_kernels = _if_dynamic_kernels if_static = _if_static if_static_and_not_mobile = _if_static_and_not_mobile -register_extension_info = _register_extension_info tf_additional_grpc_deps_py = _tf_additional_grpc_deps_py tf_additional_license_deps = _tf_additional_license_deps tf_additional_plugin_deps = _tf_additional_plugin_deps diff --git a/tensorflow/core/platform/default/build_config_root.bzl b/tensorflow/core/platform/default/build_config_root.bzl index 6012b4db407..38aeb9fb6ba 100644 --- a/tensorflow/core/platform/default/build_config_root.bzl +++ b/tensorflow/core/platform/default/build_config_root.bzl @@ -71,6 +71,3 @@ def if_dynamic_kernels(extra_deps, otherwise = []): str(Label("//tensorflow:dynamic_loaded_kernels")): extra_deps, "//conditions:default": otherwise, }) - -def register_extension_info(**kwargs): - pass diff --git a/tensorflow/core/platform/default/distribute.bzl b/tensorflow/core/platform/default/distribute.bzl index b16d5e8cff7..058ed0c4ff8 100644 --- a/tensorflow/core/platform/default/distribute.bzl +++ b/tensorflow/core/platform/default/distribute.bzl @@ -1,9 +1,5 @@ """Build rules for tf.distribute testing.""" -load( - "//tensorflow/core/platform:build_config_root.bzl", - "register_extension_info", -) load("//tensorflow/python/tpu:tpu.bzl", _tpu_py_test = "tpu_py_test") load("//tensorflow:tensorflow.bzl", "cuda_py_test") @@ -81,8 +77,3 @@ def distribute_py_test( disable_v3 = disable_v3, disable_mlir_bridge = disable_mlir_bridge, ) - -register_extension_info( - extension_name = "distribute_py_test", - label_regex_for_dep = "{extension_name}", -) diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 45c9dcbe9f7..075730742c6 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -4,7 +4,6 @@ load( "//tensorflow/core/platform:build_config_root.bzl", "if_dynamic_kernels", "if_static", - "register_extension_info", "tf_additional_grpc_deps_py", "tf_additional_xla_deps_py", "tf_exec_properties", @@ -649,11 +648,6 @@ def tf_cc_shared_object( visibility = visibility, ) -register_extension_info( - extension_name = "tf_cc_shared_object", - label_regex_for_dep = "{extension_name}", -) - # Links in the framework shared object # (//third_party/tensorflow:libtensorflow_framework.so) when not building # statically. Also adds linker options (rpaths) so that the framework shared @@ -709,11 +703,6 @@ def tf_cc_binary( visibility = visibility, ) -register_extension_info( - extension_name = "tf_cc_binary", - label_regex_for_dep = "{extension_name}.*", -) - # A simple wrap around native.cc_binary rule. # When using this rule, you should realize it doesn't link to any tensorflow # dependencies by default. @@ -738,11 +727,6 @@ def tf_native_cc_binary( **kwargs ) -register_extension_info( - extension_name = "tf_native_cc_binary", - label_regex_for_dep = "{extension_name}.*", -) - def tf_gen_op_wrapper_cc( name, out_ops_file, @@ -1092,11 +1076,6 @@ def tf_cc_test( **kwargs ) -register_extension_info( - extension_name = "tf_cc_test", - label_regex_for_dep = "{extension_name}.*", -) - # Part of the testing workflow requires a distinguishable name for the build # rules that involve a GPU, even if otherwise identical to the base rule. def tf_cc_test_gpu( @@ -1121,11 +1100,6 @@ def tf_cc_test_gpu( tags = tags, ) -register_extension_info( - extension_name = "tf_cc_test_gpu", - label_regex_for_dep = "{extension_name}", -) - def tf_gpu_cc_test( name, srcs = [], @@ -1176,20 +1150,10 @@ def tf_gpu_cc_test( ]), ) -register_extension_info( - extension_name = "tf_gpu_cc_test", - label_regex_for_dep = "{extension_name}", -) - # terminology changes: saving tf_cuda_* definition for compatibility def tf_cuda_cc_test(*args, **kwargs): tf_gpu_cc_test(*args, **kwargs) -register_extension_info( - extension_name = "tf_cuda_cc_test", - label_regex_for_dep = "{extension_name}", -) - def tf_gpu_only_cc_test( name, srcs = [], @@ -1229,20 +1193,10 @@ def tf_gpu_only_cc_test( exec_properties = tf_exec_properties({"tags": tags}), ) -register_extension_info( - extension_name = "tf_gpu_only_cc_test", - label_regex_for_dep = "{extension_name}_gpu", -) - # terminology changes: saving tf_cuda_* definition for compatibility def tf_cuda_only_cc_test(*args, **kwargs): tf_gpu_only_cc_test(*args, **kwargs) -register_extension_info( - extension_name = "tf_cuda_only_cc_test", - label_regex_for_dep = "{extension_name}_gpu", -) - # Create a cc_test for each of the tensorflow tests listed in "tests", along # with a test suite of the given name, if provided. def tf_cc_tests( @@ -1374,11 +1328,6 @@ def tf_java_test( **kwargs ) -register_extension_info( - extension_name = "tf_java_test", - label_regex_for_dep = "{extension_name}", -) - def _cuda_copts(opts = []): """Gets the appropriate set of copts for (maybe) CUDA compilation. @@ -1430,11 +1379,6 @@ def tf_gpu_kernel_library( **kwargs ) -register_extension_info( - extension_name = "tf_gpu_kernel_library", - label_regex_for_dep = "{extension_name}", -) - def tf_gpu_library(deps = None, cuda_deps = None, copts = tf_copts(), **kwargs): """Generate a cc_library with a conditional set of CUDA dependencies. @@ -1470,20 +1414,10 @@ def tf_gpu_library(deps = None, cuda_deps = None, copts = tf_copts(), **kwargs): **kwargs ) -register_extension_info( - extension_name = "tf_gpu_library", - label_regex_for_dep = "{extension_name}", -) - # terminology changes: saving tf_cuda_* definition for compatibility def tf_cuda_library(*args, **kwargs): tf_gpu_library(*args, **kwargs) -register_extension_info( - extension_name = "tf_cuda_library", - label_regex_for_dep = "{extension_name}", -) - def tf_kernel_library( name, prefix = None, @@ -1596,11 +1530,6 @@ def tf_kernel_library( deps = deps, ) -register_extension_info( - extension_name = "tf_kernel_library", - label_regex_for_dep = "({extension_name}(_gpu)?|libtfkernel_{extension_name}\\.so)", -) - def tf_mkl_kernel_library( name, prefix = None, @@ -1639,11 +1568,6 @@ def tf_mkl_kernel_library( features = disable_header_modules, ) -register_extension_info( - extension_name = "tf_mkl_kernel_library", - label_regex_for_dep = "{extension_name}", -) - def _get_transitive_headers(hdrs, deps): """Obtain the header files for a target and its transitive dependencies. @@ -1911,11 +1835,6 @@ def tf_custom_op_library(name, srcs = [], gpu_srcs = [], deps = [], linkopts = [ **kwargs ) -register_extension_info( - extension_name = "tf_custom_op_library", - label_regex_for_dep = "{extension_name}", -) - # Placeholder to use until bazel supports py_strict_binary. def py_strict_binary(name, **kwargs): native.py_binary(name = name, **kwargs) @@ -1946,11 +1865,6 @@ def tf_custom_op_py_library( deps = deps, ) -register_extension_info( - extension_name = "tf_custom_op_py_library", - label_regex_for_dep = "{extension_name}", -) - # In tf_py_wrap_cc_opensource generated libraries # module init functions are not exported unless # they contain one of the keywords in the version file @@ -2172,11 +2086,6 @@ def py_test(deps = [], data = [], kernels = [], exec_properties = None, **kwargs **kwargs ) -register_extension_info( - extension_name = "py_test", - label_regex_for_dep = "{extension_name}", -) - # Similar to py_test above, this macro is used to exclude dependencies for some py_binary # targets in order to reduce the size of //tensorflow/tools/pip_package:simple_console_windows. # See https://github.com/tensorflow/tensorflow/issues/22390 @@ -2197,11 +2106,6 @@ def py_binary(name, deps = [], **kwargs): **kwargs ) -register_extension_info( - extension_name = "py_binary", - label_regex_for_dep = "{extension_name}", -) - def pytype_library(**kwargs): # Types not enforced in OSS. native.py_library(**kwargs) @@ -2298,11 +2202,6 @@ def tf_py_test( **kwargs ) -register_extension_info( - extension_name = "tf_py_test", - label_regex_map = {"deps": "deps:{extension_name}"}, -) - def gpu_py_test( name, srcs, @@ -2363,20 +2262,10 @@ def gpu_py_test( **kwargs ) -register_extension_info( - extension_name = "gpu_py_test", - label_regex_map = {"deps": "deps:{extension_name}"}, -) - # terminology changes: saving cuda_* definition for compatibility def cuda_py_test(*args, **kwargs): gpu_py_test(*args, **kwargs) -register_extension_info( - extension_name = "cuda_py_test", - label_regex_map = {"deps": "deps:{extension_name}"}, -) - def py_tests( name, srcs, @@ -2621,11 +2510,6 @@ def cc_library_with_android_deps( deps = if_not_android(deps) + if_android(android_deps) + common_deps cc_library(deps = deps, copts = copts, **kwargs) -register_extension_info( - extension_name = "cc_library_with_android_deps", - label_regex_for_dep = "{extension_name}", -) - def tensorflow_opensource_extra_deps(): return []