Fixes that needs to be available in the main branch in order to cherry-pick into Release branch#49
Merged
vkarampudi merged 19 commits intogoogle:masterfrom Feb 5, 2026
Merged
Conversation
Update 0.48.0 in version.py and RELEASE.md
…tion Protobuf 4.x removed py_proto_library and changed proto_library behavior. This commit: - Creates _py_proto_library_rule: a custom Bazel rule that accepts ProtoInfo or PyInfo, runs protoc to generate Python _pb2.py files, and provides PyInfo for Python deps - Replaces deprecated py_proto_library calls with custom rule implementation - Configures protoc proto_path to include workspace dirs and external dependencies - Adds local any.proto copies to bypass sandbox limitations in proto imports - Applies compatibility patches to TensorFlow and TensorFlow Metadata dependencies - Updates all s2t_proto_library_py calls to work with new implementation Fixes: Protobuf 4.23.4 compatibility for struct2tensor build system
This patch extends tensorflow.patch with changes to support:
1. Abseil backward compatibility:
- Add absl_base_prefetch.h compatibility shim for older Abseil
versions that lack absl/base/prefetch.h
- Update prefetch includes across TensorFlow/TSL to use the shim
- Add inline implementation of NullTerminatedMessage for older
Abseil versions without StatusMessageAsCStr
2. Protobuf 4.x support:
- Refactor cc_proto_library to use native proto_library and
cc_proto_library rules instead of custom proto_gen
- Implement custom _tsl_py_proto_library_rule to replace the
built-in py_proto_library removed in Protobuf 4.x
- Update proto library generation to depend on generated
cc_proto_library targets
3. Build cleanup:
- Remove unused absl/strings:string_view dependency
- Update BUILD files to reflect new dependency structure
These changes enable building struct2tensor with older Abseil versions
while supporting Protobuf 4.x, improving compatibility across different
dependency versions.
Remove vendored google/protobuf/any.proto and obsolete third_party/README.md
Upgrade `struct2tensor` to Protobuf 4.25.6 with compatibility patches
Testing to Testing1
Prefix cc_binary and cc_library with native. in struct2tensor.bzl
Use native prefix for Bazel rules in macros
Apply rules_cc patch before adding struct2tensor local repository to ensure proper Bazel configuration.
Fix struct2tensor integration in TensorFlow Serving Docker build
genehwung
approved these changes
Feb 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.