Merge branch 'google:master' into test-workflow

Author: aktech

README.md

@@ -4,7 +4,7 @@
 [![PyPI](https://badge.fury.io/py/struct2tensor.svg)](https://badge.fury.io/py/struct2tensor)
 
 <!--*
-freshness: { owner: 'iindyk' reviewed: '2024-04-22' }
+freshness: { owner: 'iindyk' reviewed: '2025-04-02' }
 *-->
 
 ## Introduction
@@ -115,6 +115,7 @@ is an integer.
 
 struct2tensor                                                          | tensorflow
 ---------------------------------------------------------------------- | ----------
+[0.48.0](https://github.com/google/struct2tensor/releases/tag/v0.48.0) | 2.17.0
 [0.47.0](https://github.com/google/struct2tensor/releases/tag/v0.47.0) | 2.16.2
 [0.46.0](https://github.com/google/struct2tensor/releases/tag/v0.46.0) | 2.15.0
 [0.45.0](https://github.com/google/struct2tensor/releases/tag/v0.45.0) | 2.13.0

RELEASE.md

@@ -1,6 +1,6 @@
 # `struct2tensor` release notes
 
-# Current Version (not yet released; still in development)
+## Current Version (not yet released; still in development)
 
 ## Major Features and Improvements
 
@@ -10,7 +10,27 @@
 
 ## Deprecations
 
-# Version 0.47.0
+## Version 0.48.0
+
+## Major Features and Improvements
+
+*   N/A
+
+## Bug Fixes and Other Changes
+
+*   Depends on `protobuf>=4.25.2,<6.0.0` for Python 3.11 and on `protobuf>=4.21.6,<6.0.0` for 3.9 and 3.10.
+*   Depends on `tensorflow 2.17.1`.
+*   macOS wheel publishing is temporarily paused due to missing ARM64 support.
+
+## Breaking Changes
+
+*   N/A
+
+## Deprecations
+
+*   N/A
+
+## Version 0.47.0
 
 ## Major Features and Improvements
 
@@ -30,7 +50,7 @@
 
 *   N/A
 
-# Version 0.46.0
+## Version 0.46.0
 
 ## Major Features and Improvements
 
@@ -53,7 +73,7 @@
 
 *   Deprecated python 3.8 support.
 
-# Version 0.45.0
+## Version 0.45.0
 
 ## Major Features and Improvements
 
@@ -73,7 +93,7 @@
 
 *   N/A
 
-# Version 0.44.0
+## Version 0.44.0
 
 ## Major Features and Improvements
 
@@ -93,7 +113,7 @@
 
 *   Deprecated python 3.7 support.
 
-# Version 0.43.0
+## Version 0.43.0
 
 ## Major Features and Improvements
 
@@ -111,7 +131,7 @@
 
 *   N/A
 
-# Version 0.42.0
+## Version 0.42.0
 
 ## Major Features and Improvements
 
@@ -130,7 +150,7 @@
 
 *   N/A
 
-# Version 0.41.0
+## Version 0.41.0
 
 ## Major Features and Improvements
 
@@ -149,7 +169,7 @@
 
 *   N/A
 
-# Version 0.40.0
+## Version 0.40.0
 
 ## Major Features and Improvements
 
@@ -170,7 +190,7 @@
 
 *   N/A
 
-# Version 0.39.0
+## Version 0.39.0
 
 ## Major Features and Improvements
 
@@ -188,7 +208,7 @@
 
 *   N/A
 
-# Version 0.38.0
+## Version 0.38.0
 
 ## Major Features and Improvements
 
@@ -208,7 +228,7 @@
 
 *   N/A
 
-# Version 0.37.0
+## Version 0.37.0
 
 ## Major Features and Improvements
 
@@ -226,7 +246,7 @@
 
 *   N/A
 
-# Version 0.36.0
+## Version 0.36.0
 
 ## Major Features and Improvements
 
@@ -245,7 +265,7 @@
 
 *   N/A
 
-# Version 0.35.0
+## Version 0.35.0
 
 ## Major Features and Improvements
 
@@ -263,7 +283,7 @@
 
 *   Deprecated python 3.6 support.
 
-# Version 0.34.0
+## Version 0.34.0
 
 ## Major Features and Improvements
 

examples/prensor_playground.ipynb

@@ -79,13 +79,13 @@ def select_constraint(default, nightly=None, git_master=None):
         # TODO(b/263060885): Remove the explicit numpy dependency once TF works
         # with numpy>=1.24.
         'numpy>=1.22',
-        'protobuf>=4.25.2,<6;python_version>="3.11"',
-        'protobuf>=3.20.3,<5;python_version<"3.11"',
-        'tensorflow>=2.16,<2.17',
+        'protobuf>=4.25.2,<6.0.0;python_version>="3.11"',
+        'protobuf>=4.21.6,<6.0.0;python_version<"3.11"',
+        'tensorflow>=2.17,<2.18',
         'tensorflow-metadata'
         + select_constraint(
-            default='>=1.16.1,<1.17.0',
-            nightly='>=1.17.0.dev',
+            default='>=1.17.0,<1.18.0',
+            nightly='>=1.18.0.dev',
             git_master='@git+https://github.com/tensorflow/metadata@master',
         ),
         'pyarrow>=10,<11',

setup.py

@@ -15,6 +15,7 @@
 # Prensors provide a way to parse protocol buffers and other structured data in tensorflow
 # simply and efficiently.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 # Placeholder: load py_test
 
 load("//struct2tensor:struct2tensor.bzl", "s2t_pytype_library")
@@ -37,7 +38,6 @@ s2t_pytype_library(
     srcs = [
         "__init__.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":calculate_options",
         ":expression",
@@ -55,7 +55,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/__init__.py",
     ],
-    srcs_version = "PY2AND3",
     deps = [
         ":calculate_options",
         ":expression",
@@ -84,7 +83,6 @@ s2t_pytype_library(
     srcs = [
         "path.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         "@com_github_tensorflow_metadata//tensorflow_metadata/proto/v0:py_metadata_v0_proto_py",
         "@com_google_protobuf//:protobuf_python",
@@ -100,7 +98,6 @@ s2t_pytype_library(
         "prensor_util.py",
         "prensor_value.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":calculate_options",
         ":path",
@@ -117,7 +114,6 @@ s2t_pytype_library(
     srcs = [
         "calculate_options.py",
     ],
-    srcs_version = "PY3ONLY",
 )
 
 # Note: do not separate these, as eventually we want to make sure that they
@@ -146,7 +142,6 @@ s2t_pytype_library(
         "expression_impl/size.py",
         "expression_impl/slice_expression.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":calculate_options",
         ":path",
@@ -163,7 +158,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/map_prensor_to_prensor.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         ":path",
@@ -176,7 +170,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/placeholder.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         ":map_prensor_to_prensor",
@@ -190,7 +183,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/parquet.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         ":map_prensor_to_prensor",
@@ -207,7 +199,6 @@ s2t_pytype_library(
     srcs = [
         "expression_impl/proto_test_util.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":expression",
         "//struct2tensor/test:test_py_pb2",
@@ -220,7 +211,6 @@ s2t_pytype_library(
     srcs = [
         "prensor_to_structured_tensor.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":path",
         ":prensor",
@@ -232,7 +222,6 @@ s2t_pytype_library(
     srcs = [
         "structured_tensor_to_prensor.py",
     ],
-    srcs_version = "PY3ONLY",
     deps = [
         ":path",
         ":prensor",

struct2tensor/BUILD

@@ -12,10 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_cc//cc:cc_test.bzl", "cc_test")
+
 # Placeholder: load py_proto_library
 # Placeholder: load py_binary
 # Placeholder: load py_library
 # Placeholder: load py_test
+load("//third_party/protobuf/bazel:proto_library.bzl", "proto_library")
 load("//tools/build_defs/proto/cpp:cc_proto_library.bzl", "cc_proto_library")
 
 licenses(["notice"])
@@ -74,15 +77,13 @@ py_test(
     # Follow the instructions in the file to properly run the benchmark.
     args = ["--test_mode"],
     main = "struct2tensor_benchmark.py",
-    python_version = "PY3",
     shard_count = 4,
     deps = [":struct2tensor_benchmark_lib"],
 )
 
 py_binary(
     name = "struct2tensor_benchmark",
     srcs = ["struct2tensor_benchmark.py"],
-    python_version = "PY3",
     deps = [
         ":struct2tensor_benchmark_lib",
     ],
@@ -95,15 +96,13 @@ py_test(
     # Follow the instructions in the file to properly run the benchmark.
     args = ["--test_mode"],
     main = "ops_benchmark.py",
-    python_version = "PY3",
     # shard_count = 4,
     deps = [":struct2tensor_benchmark_lib"],
 )
 
 py_binary(
     name = "ops_benchmark",
     srcs = ["ops_benchmark.py"],
-    python_version = "PY3",
     deps = [
         ":struct2tensor_benchmark_lib",
     ],
@@ -112,7 +111,6 @@ py_binary(
 py_library(
     name = "struct2tensor_benchmark_util",
     srcs = ["struct2tensor_benchmark_util.py"],
-    srcs_version = "PY3ONLY",
     deps = [
         "//file/colossus/public:cns",
         "//third_party/py/cpuinfo",

struct2tensor/benchmarks/BUILD

@@ -259,6 +259,7 @@ def __str__(self) -> str:
 
   def _create_value_error(self) -> ValueError:
     """Creates a ValueError, assuming there should be one for this node."""
+    assert self.value is not None
     return ValueError("Expression {} returned the wrong type:"
                       " expected: {}"
                       " actual: {}.".format(
@@ -353,8 +354,14 @@ def calculate_values(
       options: calculate_options.Options,
       feed_dict: Optional[Dict[expression.Expression, prensor.Prensor]] = None
   ) -> None:
+    """Calculates the values of the expressions in the graph."""
     for node in self.ordered_node_list:
-      source_values = [self._node[id(x)].value for x in node.sources]
+      source_values = [
+          self._node[id(x)].value
+          for x in node.sources
+          if self._node[id(x)] is not None
+          and self._node[id(x)].value is not None
+      ]
       side_info = feed_dict[node.expression] if feed_dict and (
           node.expression in feed_dict) else None
       node.calculate(source_values, options, side_info=side_info)

struct2tensor/calculate.py

@@ -89,19 +89,22 @@ def test_calculate_mock(self):
     self.assertIs(my_input._calculate_output, result)
 
   def test_calculate_broken_mock_is_repeated(self):
-    with self.assertRaisesRegexp(
+    with self.assertRaisesRegex(
         ValueError,
         "Expression Node0 returned the wrong type: expected: repeated <dtype: "
-        "'int64'> actual: optional <dtype: 'int64'>."):
+        "'int64'> actual: optional <dtype: 'int64'>.",
+    ):
       single_node = expression_test_util.get_mock_broken_leaf(
           True, tf.int64, False, tf.int64, name="Node0")
       calculate.calculate_values([single_node])
 
   def test_calculate_broken_mock_dtype(self):
-    with self.assertRaisesRegexp(
-        ValueError, "Expression Node0 returned the "
+    with self.assertRaisesRegex(
+        ValueError,
+        "Expression Node0 returned the "
         "wrong type: expected: repeated <dtype: "
-        "'int64'> actual: repeated <dtype: 'int32'>."):
+        "'int64'> actual: repeated <dtype: 'int32'>.",
+    ):
       single_node = expression_test_util.get_mock_broken_leaf(
           True, tf.int64, True, tf.int32, name="Node0")
       calculate.calculate_values([single_node])