mirror of
https://github.com/zebrajr/tensorflow.git
synced 2026-01-15 12:15:41 +00:00
Make protobuf 3.9.2 work with Bazel 4.x
Upgrading protobuf has failed in https://github.com/tensorflow/tensorflow/pull/52853, this change is to work around issues in older protobuf versions for upgrading Bazel by cherry-picking two protobuf commits. See https://github.com/bazelbuild/bazel/issues/12887#issuecomment-768684625 Commit 1: [bazel] Use proto_library targets to exclude WKPs from code-gen This prepares protobuf for a future release of Bazel which will make `ProtoInfo` mandatory for `proto_lang_toolchain.blacklisted_protos`. Commit 2: [bazel] Remove bootstrap hack from cc_proto_library and add interop with proto_library Bazel had a native `cc_proto_library` for more than 2 years now. This is the first step towards removing that rule from the Protobuf repo. PiperOrigin-RevId: 412892006 Change-Id: I424974d3f5be371d6b83d62fc24683cd84ff2585
This commit is contained in:
A. Unique TensorFlower
committed by
TensorFlower Gardener
TensorFlower Gardener
parent
84af5b0833
commit
2cba5a49e9
143
third_party/protobuf/protobuf.patch
vendored
143
third_party/protobuf/protobuf.patch
vendored
@@ -1,5 +1,5 @@
|
||||
diff --git a/BUILD b/BUILD
|
||||
index dbae719..87dc384 100644
|
||||
index dbae719ff..4e276c854 100644
|
||||
--- a/BUILD
|
||||
+++ b/BUILD
|
||||
@@ -23,7 +23,7 @@ config_setting(
|
||||
@@ -11,7 +11,15 @@ index dbae719..87dc384 100644
|
||||
|
||||
################################################################################
|
||||
# Protobuf Runtime Library
|
||||
@@ -143,6 +143,7 @@ cc_library(
|
||||
@@ -100,6 +100,7 @@ LINK_OPTS = select({
|
||||
|
||||
load(
|
||||
":protobuf.bzl",
|
||||
+ "adapt_proto_library",
|
||||
"cc_proto_library",
|
||||
"py_proto_library",
|
||||
"internal_copied_filegroup",
|
||||
@@ -143,6 +144,7 @@ cc_library(
|
||||
copts = COPTS,
|
||||
includes = ["src/"],
|
||||
linkopts = LINK_OPTS,
|
||||
@@ -19,7 +27,7 @@ index dbae719..87dc384 100644
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -213,6 +214,7 @@ cc_library(
|
||||
@@ -213,6 +215,7 @@ cc_library(
|
||||
copts = COPTS,
|
||||
includes = ["src/"],
|
||||
linkopts = LINK_OPTS,
|
||||
@@ -27,11 +35,51 @@ index dbae719..87dc384 100644
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [":protobuf_lite"] + PROTOBUF_DEPS,
|
||||
)
|
||||
@@ -255,13 +258,15 @@ filegroup(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
-cc_proto_library(
|
||||
+adapt_proto_library(
|
||||
+ name = "cc_wkt_protos_genproto",
|
||||
+ deps = [proto + "_proto" for proto in WELL_KNOWN_PROTO_MAP.keys()],
|
||||
+ visibility = ["//visibility:public"],
|
||||
+)
|
||||
+
|
||||
+cc_library(
|
||||
name = "cc_wkt_protos",
|
||||
- srcs = WELL_KNOWN_PROTOS,
|
||||
- include = "src",
|
||||
- default_runtime = ":protobuf",
|
||||
- internal_bootstrap_hack = 1,
|
||||
- protoc = ":protoc",
|
||||
+ deprecation = "Only for backward compatibility. Do not use.",
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -978,10 +983,10 @@ cc_library(
|
||||
|
||||
proto_lang_toolchain(
|
||||
name = "cc_toolchain",
|
||||
+ blacklisted_protos = [proto + "_proto" for proto in WELL_KNOWN_PROTO_MAP.keys()],
|
||||
command_line = "--cpp_out=$(OUT)",
|
||||
runtime = ":protobuf",
|
||||
visibility = ["//visibility:public"],
|
||||
- blacklisted_protos = [":_internal_wkt_protos_genrule"],
|
||||
)
|
||||
|
||||
proto_lang_toolchain(
|
||||
diff --git a/protobuf.bzl b/protobuf.bzl
|
||||
index e065332..92ae3b4 100644
|
||||
index e0653321f..4156a1275 100644
|
||||
--- a/protobuf.bzl
|
||||
+++ b/protobuf.bzl
|
||||
@@ -85,6 +85,8 @@ def _proto_gen_impl(ctx):
|
||||
@@ -1,4 +1,5 @@
|
||||
load("@bazel_skylib//lib:versions.bzl", "versions")
|
||||
+load("@rules_proto//proto:defs.bzl", "ProtoInfo")
|
||||
|
||||
def _GetPath(ctx, path):
|
||||
if ctx.label.workspace_root:
|
||||
@@ -85,6 +86,8 @@ def _proto_gen_impl(ctx):
|
||||
for dep in ctx.attr.deps:
|
||||
import_flags += dep.proto.import_flags
|
||||
deps += dep.proto.deps
|
||||
@@ -40,8 +88,88 @@ index e065332..92ae3b4 100644
|
||||
|
||||
if not ctx.attr.gen_cc and not ctx.attr.gen_py and not ctx.executable.plugin:
|
||||
return struct(
|
||||
@@ -222,6 +225,29 @@ Args:
|
||||
outs: a list of labels of the expected outputs from the protocol compiler.
|
||||
"""
|
||||
|
||||
+def _adapt_proto_library_impl(ctx):
|
||||
+ deps = [dep[ProtoInfo] for dep in ctx.attr.deps]
|
||||
+
|
||||
+ srcs = [src for dep in deps for src in dep.direct_sources]
|
||||
+ return struct(
|
||||
+ proto = struct(
|
||||
+ srcs = srcs,
|
||||
+ import_flags = ["-I{}".format(path) for dep in deps for path in dep.transitive_proto_path.to_list()],
|
||||
+ deps = srcs,
|
||||
+ ),
|
||||
+ )
|
||||
+
|
||||
+adapt_proto_library = rule(
|
||||
+ implementation = _adapt_proto_library_impl,
|
||||
+ attrs = {
|
||||
+ "deps": attr.label_list(
|
||||
+ mandatory = True,
|
||||
+ providers = [ProtoInfo],
|
||||
+ ),
|
||||
+ },
|
||||
+ doc = "Adapts `proto_library` from `@rules_proto` to be used with `{cc,py}_proto_library` from this file.",
|
||||
+)
|
||||
+
|
||||
def cc_proto_library(
|
||||
name,
|
||||
srcs = [],
|
||||
@@ -229,7 +255,6 @@ def cc_proto_library(
|
||||
cc_libs = [],
|
||||
include = None,
|
||||
protoc = "@com_google_protobuf//:protoc",
|
||||
- internal_bootstrap_hack = False,
|
||||
use_grpc_plugin = False,
|
||||
default_runtime = "@com_google_protobuf//:protobuf",
|
||||
**kargs):
|
||||
@@ -247,41 +272,17 @@ def cc_proto_library(
|
||||
cc_library.
|
||||
include: a string indicating the include path of the .proto files.
|
||||
protoc: the label of the protocol compiler to generate the sources.
|
||||
- internal_bootstrap_hack: a flag indicate the cc_proto_library is used only
|
||||
- for bootstraping. When it is set to True, no files will be generated.
|
||||
- The rule will simply be a provider for .proto files, so that other
|
||||
- cc_proto_library can depend on it.
|
||||
use_grpc_plugin: a flag to indicate whether to call the grpc C++ plugin
|
||||
when processing the proto files.
|
||||
default_runtime: the implicitly default runtime which will be depended on by
|
||||
the generated cc_library target.
|
||||
**kargs: other keyword arguments that are passed to cc_library.
|
||||
-
|
||||
"""
|
||||
|
||||
includes = []
|
||||
if include != None:
|
||||
includes = [include]
|
||||
|
||||
- if internal_bootstrap_hack:
|
||||
- # For pre-checked-in generated files, we add the internal_bootstrap_hack
|
||||
- # which will skip the codegen action.
|
||||
- proto_gen(
|
||||
- name = name + "_genproto",
|
||||
- srcs = srcs,
|
||||
- deps = [s + "_genproto" for s in deps],
|
||||
- includes = includes,
|
||||
- protoc = protoc,
|
||||
- visibility = ["//visibility:public"],
|
||||
- )
|
||||
-
|
||||
- # An empty cc_library to make rule dependency consistent.
|
||||
- native.cc_library(
|
||||
- name = name,
|
||||
- **kargs
|
||||
- )
|
||||
- return
|
||||
-
|
||||
grpc_cpp_plugin = None
|
||||
if use_grpc_plugin:
|
||||
grpc_cpp_plugin = "//external:grpc_cpp_plugin"
|
||||
diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc
|
||||
index 3530a9b..c31fa8f 100644
|
||||
index 3530a9b37..c31fa8fcc 100644
|
||||
--- a/python/google/protobuf/pyext/message.cc
|
||||
+++ b/python/google/protobuf/pyext/message.cc
|
||||
@@ -2991,8 +2991,12 @@ bool InitProto2MessageModule(PyObject *m) {
|
||||
@@ -58,6 +186,3 @@ index 3530a9b..c31fa8f 100644
|
||||
if (collections == NULL) {
|
||||
return false;
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user