Separate `executor.proto` from `computation.proto` into separate targets.

* This makes it easier to depend on one and not the other.
* This makes deps easier to manage because the dep has the same name as the import.

PiperOrigin-RevId: 270950880

tensorflow_federated/proto/v0/BUILD

@@ -10,14 +10,23 @@ py_library(
 )
 
 py_proto_library(
-    name = "tensorflow_federated_v0_py_pb2",
-    srcs = [
-      "computation.proto",
-      "executor.proto",
-    ],
+    name = "computation_py_pb2",
+    srcs = ["computation.proto"],
     default_runtime = "@com_google_protobuf//:protobuf_python",
     protoc = "@com_google_protobuf//:protoc",
     srcs_version = "PY2AND3",
-    use_grpc_plugin = True,
     deps = ["@com_google_protobuf//:protobuf_python"],
 )
+
+py_proto_library(
+    name = "executor_py_pb2",
+    srcs = ["executor.proto"],
+    default_runtime = "@com_google_protobuf//:protobuf_python",
+    protoc = "@com_google_protobuf//:protoc",
+    srcs_version = "PY2AND3",
+    use_grpc_plugin = True,
+    deps = [
+        "@com_google_protobuf//:protobuf_python",
+        ":computation_py_pb2",
+    ],
+)

tensorflow_federated/python/core/backends/mapreduce/BUILD

@@ -16,7 +16,7 @@ py_library(
     name = "canonical_form",
     srcs = ["canonical_form.py"],
     deps = [
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api",
     ],
@@ -89,7 +89,7 @@ py_test(
         ":canonical_form_utils",
         ":test_utils",
         ":transformations",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:intrinsics",
         "//tensorflow_federated/python/core/api:placements",

tensorflow_federated/python/core/impl/BUILD

@@ -37,7 +37,7 @@ py_library(
         ":executor_base",
         ":executor_value_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -70,7 +70,7 @@ py_library(
         ":context_stack_base",
         ":transformations",
         ":value_transformations",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_base",
         "//tensorflow_federated/python/core/impl/compiler:building_blocks",
@@ -102,7 +102,7 @@ py_library(
     srcs = ["compiled_computation_transforms.py"],
     visibility = [":compiler_visibility"],
     deps = [
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/common_libs:serialization_utils",
@@ -147,7 +147,7 @@ py_library(
         ":executor_utils",
         ":executor_value_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -186,7 +186,7 @@ py_library(
     deps = [
         ":context_stack_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/impl/compiler:type_serialization",
@@ -203,7 +203,7 @@ py_test(
     deps = [
         ":computation_impl",
         ":context_stack_impl",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/impl/compiler:type_serialization",
     ],
@@ -337,7 +337,7 @@ py_library(
         ":executor_base",
         ":executor_value_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/common_libs:serialization_utils",
@@ -428,7 +428,7 @@ py_library(
         ":executor_base",
         ":executor_service_utils",
         ":executor_value_base",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:executor_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
     ],
@@ -446,7 +446,7 @@ py_test(
         ":executor_service",
         ":executor_service_utils",
         ":executor_value_base",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:executor_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computations",
     ],
@@ -460,7 +460,8 @@ py_library(
         ":computation_impl",
         ":tensorflow_serialization",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
+        "//tensorflow_federated/proto/v0:executor_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -478,7 +479,8 @@ py_test(
     srcs_version = "PY3",
     deps = [
         ":executor_service_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
+        "//tensorflow_federated/proto/v0:executor_py_pb2",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
         "//tensorflow_federated/python/core/impl/compiler:type_factory",
@@ -557,7 +559,7 @@ py_library(
         ":executor_base",
         ":executor_value_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -639,7 +641,7 @@ py_library(
         ":executor_utils",
         ":executor_value_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -662,7 +664,7 @@ py_test(
         ":executor_test_utils",
         ":federated_executor",
         ":lambda_executor",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:computations",
@@ -759,7 +761,7 @@ py_library(
         ":executor_value_base",
         ":transformations",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -874,7 +876,7 @@ py_library(
         ":executor_base",
         ":executor_service_utils",
         ":executor_value_base",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:executor_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -934,7 +936,7 @@ py_library(
     visibility = [":utils_visibility"],
     deps = [
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/common_libs:serialization_utils",
         "//tensorflow_federated/python/core/impl/compiler:type_serialization",
@@ -961,7 +963,7 @@ py_library(
     deps = [
         ":context_stack_base",
         ":tf_computation_context",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/common_libs:serialization_utils",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -1070,7 +1072,7 @@ py_library(
         ":computation_impl",
         ":executor_base",
         ":type_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/impl/compiler:building_blocks",
     ],

tensorflow_federated/python/core/impl/compiler/BUILD

@@ -34,7 +34,7 @@ py_test(
         ":building_block_analysis",
         ":building_blocks",
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:serialization_utils",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/impl/utils:tensorflow_utils",
@@ -50,7 +50,7 @@ py_library(
         ":placement_literals",
         ":transformation_utils",
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/common_libs:serialization_utils",
@@ -87,7 +87,7 @@ py_library(
         ":intrinsic_defs",
         ":placement_literals",
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -108,7 +108,7 @@ py_test(
         ":intrinsic_defs",
         ":test_utils",
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:placements",
@@ -155,7 +155,7 @@ py_library(
     name = "proto_transformations",
     srcs = ["proto_transformations.py"],
     deps = [
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/common_libs:serialization_utils",
         "//tensorflow_federated/python/core/impl/utils:tensorflow_utils",
@@ -175,7 +175,7 @@ py_test(
         ":proto_transformations",
         ":test_utils",
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:serialization_utils",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/impl/utils:tensorflow_utils",
@@ -254,7 +254,7 @@ py_test(
         ":test_utils",
         ":tree_analysis",
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:serialization_utils",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:placements",
@@ -285,7 +285,7 @@ py_library(
     srcs = ["type_serialization.py"],
     deps = [
         ":placement_literals",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -300,7 +300,7 @@ py_test(
     srcs_version = "PY3",
     deps = [
         ":type_serialization",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:test",
         "//tensorflow_federated/python/core/api:computation_types",
         "//tensorflow_federated/python/core/api:placements",

tensorflow_federated/python/core/impl/utils/BUILD

@@ -52,7 +52,7 @@ py_library(
     srcs = ["tensorflow_utils.py"],
     deps = [
         ":function_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:py_typecheck",
         "//tensorflow_federated/python/core/api:computation_types",
@@ -68,7 +68,7 @@ py_test(
     srcs_version = "PY3",
     deps = [
         ":tensorflow_utils",
-        "//tensorflow_federated/proto/v0:tensorflow_federated_v0_py_pb2",
+        "//tensorflow_federated/proto/v0:computation_py_pb2",
         "//tensorflow_federated/python/common_libs:anonymous_tuple",
         "//tensorflow_federated/python/common_libs:test",
         "//tensorflow_federated/python/core/api:computation_types",