Bumps oldest supported TF version to 2.12.

mihirparadkar · tensorflower-gardener · commit c7d6381b5f01 · 2023-11-08T13:43:52.000-08:00
Swaps proto build to @rules_python from @com_google_protobuf (which is causing build failures from *_genproto targets).

PiperOrigin-RevId: 580643569
diff --git a/WORKSPACE b/WORKSPACE
@@ -6,6 +6,22 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@tensorflow_gnn//package:tfdep.bzl", "tf_setup")
 tf_setup()
 
+http_archive(
+    name = "rules_proto",
+    sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
+    strip_prefix = "rules_proto-5.3.0-21.7",
+    urls = [
+        "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
+    ],
+)
+
+http_archive(
+    name = "rules_python",
+    sha256 = "9d04041ac92a0985e344235f5d946f71ac543f1b1565f2cdbc9a2aaee8adf55b",
+    strip_prefix = "rules_python-0.26.0",
+    url = "https://github.com/bazelbuild/rules_python/releases/download/0.26.0/rules_python-0.26.0.tar.gz",
+)
+
 # Initialize the TensorFlow repository and all dependencies.
 # See @org_tensorflow//WORKSPACE for details.
 load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")
@@ -17,6 +33,9 @@ tf_workspace1()
 load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0")
 tf_workspace0()
 
+load("@rules_python//python:repositories.bzl", "py_repositories")
+py_repositories()
+
 # This seems required to avoid a proxy setup.
 # TODO(blais): Find a way to get rid of this.
 http_archive(
diff --git a/kokoro/github/ubuntu/cpu/oldest/continuous.cfg b/kokoro/github/ubuntu/cpu/oldest/continuous.cfg
@@ -6,7 +6,7 @@ env_vars: {
 }
 env_vars: {
   key: "TF_VERSION"
-  value: "2.10.*"
+  value: "2.12.*"
 }
 env_vars: {
   key: "TAG_FILTERS"
diff --git a/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg b/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg
@@ -6,7 +6,7 @@ env_vars: {
 }
 env_vars: {
   key: "TF_VERSION"
-  value: "2.10.*"
+  value: "2.12.*"
 }
 env_vars: {
   key: "TAG_FILTERS"
diff --git a/package/BUILD b/package/BUILD
@@ -4,11 +4,11 @@ sh_binary(
     name = "move_generated_files",
     srcs = ["move_generated_files.sh"],
     data = [
-        "//tensorflow_gnn/experimental/sampler:eval_dag_pb2.py",
-        "//tensorflow_gnn/proto:examples_pb2.py",
-        "//tensorflow_gnn/proto:graph_schema_pb2.py",
-        "//tensorflow_gnn/sampler:sampling_spec_pb2.py",
-        "//tensorflow_gnn/sampler:subgraph_pb2.py",
-        "//tensorflow_gnn/tools:sampled_stats_pb2.py",
+        "//tensorflow_gnn/experimental/sampler:eval_dag_py_proto",
+        "//tensorflow_gnn/proto:examples_py_proto",
+        "//tensorflow_gnn/proto:graph_schema_py_proto",
+        "//tensorflow_gnn/sampler:sampling_spec_py_proto",
+        "//tensorflow_gnn/sampler:subgraph_py_proto",
+        "//tensorflow_gnn/tools:sampled_stats_py_proto",
     ],
 )
diff --git a/package/tfdep.bzl b/package/tfdep.bzl
@@ -13,9 +13,9 @@ def tf_setup():
     """
     http_archive(
         name = "org_tensorflow",
-        sha256 = "99c732b92b1b37fc243a559e02f9aef5671771e272758aa4aec7f34dc92dac48",
+        sha256 = "c030cb1905bff1d2446615992aad8d8d85cbe90c4fb625cee458c63bf466bc8e",
         urls = [
-            "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.11.0.tar.gz",
+            "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.12.0.tar.gz",
         ],
-        strip_prefix = "tensorflow-2.11.0",
+        strip_prefix = "tensorflow-2.12.0",
     )
diff --git a/setup.py b/setup.py
@@ -173,12 +173,10 @@ def get_version():
         'networkx',
         'pyarrow',
         # pylint:disable=g-line-too-long
-        'tensorflow>=2.10.0; platform_machine != "arm64" or platform_system != "Darwin"',
-        'tensorflow-macos>=2.10.0; platform_machine == "arm64" and platform_system == "Darwin"',
+        'tensorflow>=2.12.0; platform_machine != "arm64" or platform_system != "Darwin"',
+        'tensorflow-macos>=2.12.0; platform_machine == "arm64" and platform_system == "Darwin"',
         # pylint:enable=g-line-too-long
-        # TODO(b/283835852): Unpin beam version when all supported TF versions
-        # enable protobuf >=3.20
-        'apache-beam<2.47.0',
+        'apache-beam',
     ],
     python_requires='>=3.8,<4',
     packages=find_namespace_packages(
diff --git a/tensorflow_gnn/experimental/sampler/BUILD b/tensorflow_gnn/experimental/sampler/BUILD
@@ -1,18 +1,22 @@
-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
+proto_library(
+    name = "eval_dag_proto",
+    srcs = ["eval_dag.proto"],
+    deps = [
+        "@org_tensorflow//tensorflow/core:protos_all",
+    ],
+)
+
 py_proto_library(
     name = "eval_dag_py_proto",
-    srcs = ["eval_dag.proto"],
-    default_runtime = "@com_google_protobuf//:protobuf_python",
-    protoc = "@com_google_protobuf//:protoc",
-    srcs_version = "PY3",
     deps = [
-        "@com_google_protobuf//:protobuf_python",
-        "@org_tensorflow//tensorflow/core:protos_all_py",
+        ":eval_dag_proto",
     ],
 )
 
diff --git a/tensorflow_gnn/proto/BUILD b/tensorflow_gnn/proto/BUILD
@@ -2,7 +2,8 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:proto.bzl", "py_proto_library")
 
 py_library(
     name = "proto",
@@ -15,15 +16,18 @@ py_library(
     ],
 )
 
+proto_library(
+    name = "graph_schema_proto",
+    srcs = ["graph_schema.proto"],
+    deps = [
+        "@org_tensorflow//tensorflow/core:protos_all",
+    ],
+)
+
 py_proto_library(
     name = "graph_schema_py_proto",
-    srcs = ["graph_schema.proto"],
-    default_runtime = "@com_google_protobuf//:protobuf_python",
-    protoc = "@com_google_protobuf//:protoc",
-    srcs_version = "PY3",
     deps = [
-        "@com_google_protobuf//:protobuf_python",
-        "@org_tensorflow//tensorflow/core:protos_all_py",
+        ":graph_schema_proto",
     ],
 )
 
@@ -36,14 +40,15 @@ py_library(
     ],
 )
 
+proto_library(
+    name = "examples_proto",
+    srcs = ["examples.proto"],
+    deps = ["@org_tensorflow//tensorflow/core:protos_all"],
+)
+
 py_proto_library(
     name = "examples_py_proto",
-    srcs = ["examples.proto"],
-    default_runtime = "@com_google_protobuf//:protobuf_python",
-    protoc = "@com_google_protobuf//:protoc",
-    srcs_version = "PY3",
     deps = [
-        "@com_google_protobuf//:protobuf_python",
-        "@org_tensorflow//tensorflow/core:protos_all_py",
+        ":examples_proto",
     ],
 )
diff --git a/tensorflow_gnn/sampler/BUILD b/tensorflow_gnn/sampler/BUILD
@@ -2,30 +2,33 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:proto.bzl", "py_proto_library")
 load("@tensorflow_gnn//tensorflow_gnn:tensorflow_gnn.bzl", "pytype_strict_contrib_test")
 
+proto_library(
+    name = "subgraph_proto",
+    srcs = ["subgraph.proto"],
+    deps = ["@org_tensorflow//tensorflow/core:protos_all"],
+)
+
 py_proto_library(
     name = "subgraph_py_proto",
-    srcs = ["subgraph.proto"],
-    default_runtime = "@com_google_protobuf//:protobuf_python",
-    protoc = "@com_google_protobuf//:protoc",
-    srcs_version = "PY3",
     deps = [
-        "@com_google_protobuf//:protobuf_python",
-        "@org_tensorflow//tensorflow/core:protos_all_py",
+        ":subgraph_proto",
     ],
 )
 
+proto_library(
+    name = "sampling_spec_proto",
+    srcs = ["sampling_spec.proto"],
+    deps = ["@org_tensorflow//tensorflow/core:protos_all"],
+)
+
 py_proto_library(
     name = "sampling_spec_py_proto",
-    srcs = ["sampling_spec.proto"],
-    default_runtime = "@com_google_protobuf//:protobuf_python",
-    protoc = "@com_google_protobuf//:protoc",
-    srcs_version = "PY3",
     deps = [
-        "@com_google_protobuf//:protobuf_python",
-        "@org_tensorflow//tensorflow/core:protos_all_py",
+        ":sampling_spec_proto",
     ],
 )
 
diff --git a/tensorflow_gnn/tools/BUILD b/tensorflow_gnn/tools/BUILD
@@ -2,15 +2,19 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # Apache 2.0
 
-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_python//python:proto.bzl", "py_proto_library")
+load("@tensorflow_gnn//tensorflow_gnn:tensorflow_gnn.bzl", "pytype_strict_contrib_test")
+
+proto_library(
+    name = "sampled_stats_proto",
+    srcs = ["sampled_stats.proto"],
+    deps = ["@org_tensorflow//tensorflow/core:protos_all"],
+)
 
 py_proto_library(
     name = "sampled_stats_py_proto",
-    srcs = ["sampled_stats.proto"],
-    default_runtime = "@com_google_protobuf//:protobuf_python",
-    protoc = "@com_google_protobuf//:protoc",
-    srcs_version = "PY3",
     deps = [
-        "@com_google_protobuf//:protobuf_python",
+        ":sampled_stats_proto",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ env_vars: {`
`6`	`6`	`}`
`7`	`7`	`env_vars: {`
`8`	`8`	`key: "TF_VERSION"`
`9`		`- value: "2.10.*"`
	`9`	`+ value: "2.12.*"`
`10`	`10`	`}`
`11`	`11`	`env_vars: {`
`12`	`12`	`key: "TAG_FILTERS"`