Merge pull request #7817 from tensorflow/sync-main

Sync main with r1.17.0 release branch

Author: 1025KB

.github/workflows/ci-test.yml

@@ -61,7 +61,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip wheel setuptools
+        python -m pip install --upgrade pip wheel setuptools==70.0.0
         # TODO(b/232490018): Cython need to be installed separately to build pycocotools.
         python -m pip install Cython -c ./test_constraints.txt
         pip install \

.github/workflows/wheels.yml

@@ -7,7 +7,7 @@ on:
     types: [published]
 
 env:
-  USE_BAZEL_VERSION: "7.2.1"
+  USE_BAZEL_VERSION: "6.5.0"
 
 jobs:
   build_sdist:

README.md

@@ -62,7 +62,10 @@ but other *untested* combinations may also work.
 
 tfx                                                                       | Python               | apache-beam[gcp] | ml-metadata | pyarrow | tensorflow        | tensorflow-data-validation | tensorflow-metadata | tensorflow-model-analysis | tensorflow-serving-api | tensorflow-transform | tfx-bsl
 ------------------------------------------------------------------------- | -------------------- | ---------------- | ----------- | ------- | ----------------- | -------------------------- | ------------------- | ------------------------- | ---------------------- | -------------------- | -------
-[GitHub master](https://github.com/tensorflow/tfx/blob/master/RELEASE.md) | >=3.9,<3.11          | 2.59.0           | 1.16.0      | 10.0.1  | nightly (2.x)     | 1.16.1                     | 1.16.1              | 0.47.0                    | 2.16.1                 | 1.16.0               | 1.16.1
+[GitHub master](https://github.com/tensorflow/tfx/blob/master/RELEASE.md) | >=3.9,<3.11          | 2.59.0           | 1.17.1      | 10.0.1  | nightly (2.x)     | 1.17.0                     | 1.17.1              | 0.48.0                    | 2.17.1                 | 1.17.0               | 1.17.1
+[1.17.2](https://github.com/tensorflow/tfx/blob/v1.17.2/RELEASE.md)       | >=3.9,<3.11          | 2.59.0           | 1.17.1      | 10.0.1  | 2.17              | 1.17.0                     | 1.17.1              | 0.48.0                    | 2.17.1                 | 1.17.0               | 1.17.1
+[1.17.1](https://github.com/tensorflow/tfx/blob/v1.17.1/RELEASE.md)       | >=3.9,<3.11          | 2.59.0           | 1.17.1      | 10.0.1  | 2.17              | 1.17.0                     | 1.17.1              | 0.48.0                    | 2.17.1                 | 1.17.0               | 1.17.1
+[1.17.0](https://github.com/tensorflow/tfx/blob/v1.17.0/RELEASE.md)       | >=3.9,<3.11          | 2.59.0           | 1.17.1      | 10.0.1  | 2.17              | 1.17.0                     | 1.17.1              | 0.48.0                    | 2.17.1                 | 1.17.0               | 1.17.1
 [1.16.0](https://github.com/tensorflow/tfx/blob/v1.16.0/RELEASE.md)       | >=3.9,<3.11          | 2.59.0           | 1.16.0      | 10.0.1  | 2.16              | 1.16.1                     | 1.16.1              | 0.47.0                    | 2.16.1                 | 1.16.0               | 1.16.1
 [1.15.0](https://github.com/tensorflow/tfx/blob/v1.15.0/RELEASE.md)       | >=3.9,<3.11          | 2.47.0           | 1.15.0      | 10.0.0  | 2.15              | 1.15.1                     | 1.15.0              | 0.46.0                    | 2.15.1                 | 1.15.0               | 1.15.1
 [1.14.0](https://github.com/tensorflow/tfx/blob/v1.14.0/RELEASE.md)       | >=3.8,<3.11          | 2.47.0           | 1.14.0      | 10.0.0  | 2.13              | 1.14.0                     | 1.14.0              | 0.45.0                    | 2.9.0                  | 1.14.0               | 1.14.0

RELEASE.md

@@ -16,6 +16,112 @@
 
 ## Documentation Updates
 
+# Version 1.17.2
+
+## Major Features and Improvements
+
+*   N/A
+
+## Breaking Changes
+
+*   N/A
+
+### For Pipeline Authors
+
+*   N/A
+
+### For Component Authors
+
+*   N/A
+
+## Deprecations
+
+*   N/A
+
+## Bug Fixes and Other Changes
+
+*   N/A
+
+# Version 1.17.1
+
+## Major Features and Improvements
+
+*   N/A
+
+## Breaking Changes
+
+*   N/A
+
+### For Pipeline Authors
+
+*   N/A
+
+### For Component Authors
+
+*   N/A
+
+## Deprecations
+
+*   N/A
+
+## Bug Fixes and Other Changes
+
+*   Ensured `tensorflow-data-validation` and `tfx-bsl` are built from
+      source within the Docker image instead of PYPI to prevent wheels Incompatibility.
+*   Updated end-to-end tests for Kubeflow v2 to use hardcoded container
+      paths for test data, resolving `RuntimeError` issues.
+*   Introduced patches for `tfdv`, `tfx-bsl`, and `tfx` to facilitate
+      compilation issues and to resolve dependency conflicts.
+
+## Dependency Updates
+
+*   Supports Tensorflow | `>=2.17.0,<2.18.0` |
+*   supports Protobuf  | `==4.21.12` |
+
+## Documentation Updates
+
+*   N/A
+
+# Version 1.17.0
+
+## Major Features and Improvements
+
+*   N/A
+
+## Breaking Changes
+
+*   N/A
+
+### For Pipeline Authors
+
+*   N/A
+
+### For Component Authors
+
+*   N/A
+
+## Deprecations
+
+*   N/A
+
+## Bug Fixes and Other Changes
+
+*   Ensured `tensorflow-data-validation` and `tfx-bsl` are built from
+      source within the Docker image instead of PYPI to prevent wheels Incompatibility.
+*   Updated end-to-end tests for Kubeflow v2 to use hardcoded container
+      paths for test data, resolving `RuntimeError` issues.
+*   Introduced patches for `tfdv`, `tfx-bsl`, and `tfx` to facilitate
+      compilation issues and to resolve dependency conflicts.
+
+## Dependency Updates
+
+*   Supports Tensorflow | `>=2.17.0,<2.18.0` |
+*   supports Protobuf  | `==4.21.12` |
+
+## Documentation Updates
+
+*   N/A
+
 # Version 1.16.0
 
 ## Major Features and Improvements

WORKSPACE

@@ -52,11 +52,39 @@ http_archive(
 )
 # LINT.ThenChange(:tf_commit)
 
+http_archive(
+    name = "build_bazel_rules_apple",
+    urls = ["https://github.com/bazelbuild/rules_apple/archive/refs/tags/0.34.1.tar.gz"],
+    sha256 = "301ad0c16585f44fdb404dee7496332501606939698afb372e8311f7445f1175",
+    strip_prefix = "rules_apple-0.34.1",
+)
+
+# Needed by gRPC.
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "cf4d63f39c7ba9059f70e995bf5fe1019267d3f77379c2028561a5d7645ef67c",
+    urls = ["https://github.com/bazelbuild/apple_support/releases/download/1.11.1/apple_support.1.11.1.tar.gz"],
+)
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "d0833bc6dad817a367936a5f902a0c11318160b5e80a20ece35fb85a5675c886",
+    strip_prefix = "rules_swift-3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8",
+    urls = ["https://github.com/bazelbuild/rules_swift/archive/3eeeb53cebda55b349d64c9fc144e18c5f7c0eb8.tar.gz"],
+)
+
+http_archive(
+    name = "com_github_grpc_grpc",
+    urls = ["https://github.com/grpc/grpc/archive/v1.46.3.tar.gz"],
+    sha256 = "d6cbf22cb5007af71b61c6be316a79397469c58c82a942552a62e708bce60964",
+    strip_prefix = "grpc-1.46.3",
+)
+
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53",
-    strip_prefix = "protobuf-3.21.12",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.12.tar.gz"],
+    sha256 = "22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de",
+    strip_prefix = "protobuf-21.12",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/v21.12/protobuf-21.12.tar.gz"],
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

nightly_test_constraints.txt

@@ -11,8 +11,8 @@
 # TODO(b/321609768): Remove pinned Flask-session version after resolving the issue.
 Flask-session<0.6.0
 
-tensorflow==2.16.2
-tensorflow-text==2.16.1
+tensorflow==2.17.1
+tensorflow-text==2.17.0
 keras==3.6.0
 
 absl-py==1.4.0
@@ -22,7 +22,7 @@ alembic==1.13.3
 annotated-types==0.7.0
 anyio==4.6.0
 apache-airflow==2.10.3
-apache-beam==2.59.0
+apache-beam==2.50.0
 apispec==6.6.1
 argcomplete==3.5.1
 argon2-cffi==23.1.0
@@ -46,7 +46,7 @@ cffi==1.17.1
 cfgv==3.4.0
 charset-normalizer==3.4.0
 chex==0.1.86
-click==8.1.7
+click==8.1.3
 clickclick==20.10.2
 cloudpickle==2.2.1
 colorama==0.4.6
@@ -98,7 +98,7 @@ google-api-core==2.21.0
 google-api-python-client==1.12.11
 google-apitools==0.5.31
 google-auth==2.35.0
-google-auth-httplib2==0.2.0
+google-auth-httplib2==0.1.1
 google-auth-oauthlib==1.2.1
 google-cloud-aiplatform==1.70.0
 google-cloud-bigquery==3.26.0
@@ -166,13 +166,13 @@ jupyterlab==4.2.5
 jupyterlab_pygments==0.3.0
 jupyterlab_server==2.27.3
 jupyterlab_widgets==1.1.10
-tf-keras==2.16.0
+tf-keras==2.17.0
 keras-tuner==1.4.7
-kfp==2.5.0
-kfp-pipeline-spec==0.2.2
+kfp==2.6.0
+kfp-pipeline-spec==0.3.0
 kfp-server-api==2.0.5
 kt-legacy==1.0.5
-kubernetes==26.1.0
+kubernetes==23.6.0
 lazy-object-proxy==1.10.0
 libclang==18.1.1
 limits==3.13.0
@@ -192,7 +192,7 @@ mdurl==0.1.2
 methodtools==0.4.7
 mistune==3.0.2
 ml-dtypes==0.3.2
-ml-metadata>=1.16.0
+ml-metadata>=1.17.1
 mmh==2.2
 more-itertools==10.5.0
 msgpack==1.1.0
@@ -207,10 +207,10 @@ nltk==3.9.1
 nodeenv==1.9.1
 notebook==7.2.2
 notebook_shim==0.2.4
-numpy==1.26.4
+numpy==1.24.4
 oauth2client==4.1.3
 oauthlib==3.2.2
-objsize==0.7.0
+objsize==0.6.1
 opentelemetry-api==1.27.0
 opentelemetry-exporter-otlp==1.27.0
 opentelemetry-exporter-otlp-proto-common==1.27.0
@@ -246,7 +246,7 @@ promise==2.3
 prompt_toolkit==3.0.48
 propcache==0.2.0
 proto-plus==1.24.0
-protobuf==3.20.3
+protobuf==4.21.12
 psutil==6.0.0
 ptyprocess==0.7.0
 pyarrow-hotfix==0.6
@@ -302,33 +302,33 @@ SQLAlchemy==1.4.54
 SQLAlchemy-JSONField==1.0.2
 SQLAlchemy-Utils==0.41.2
 sqlparse==0.5.1
-struct2tensor>=0.47.0
+struct2tensor>=0.48.1
 tabulate==0.9.0
 tenacity==9.0.0
-tensorboard==2.16.2
+tensorboard==2.17.1
 tensorboard-data-server==0.7.2
-tensorflow==2.16.2
+tensorflow==2.17.1
 tensorflow-cloud==0.1.16
-tensorflow-data-validation>=1.16.1
+tensorflow-data-validation>=1.17.0
 tensorflow-datasets==4.9.3
-tensorflow-decision-forests==1.9.2
+tensorflow-decision-forests==1.10.1
 tensorflow-estimator==2.15.0
 tensorflow-hub==0.15.0
 tensorflow-io==0.24.0
 tensorflow-io-gcs-filesystem==0.24.0
-tensorflow-metadata>=1.16.1
+tensorflow-metadata>=1.17.1
 # tensorflow-ranking==0.5.5
-tensorflow-serving-api==2.16.1
-tensorflow-text==2.16.1
-tensorflow-transform>=1.16.0
-tensorflow_model_analysis>=0.47.0
+tensorflow-serving-api==2.17.1
+tensorflow-text==2.17.0
+tensorflow-transform>=1.17.0
+tensorflow_model_analysis>=0.48.0
 tensorflowjs==4.17.0
 tensorstore==0.1.66
 termcolor==2.5.0
 terminado==0.18.1
 text-unidecode==1.3
 tflite-support==0.4.4
-tfx-bsl>=1.16.1
+tfx-bsl>=1.17.1
 threadpoolctl==3.5.0
 time-machine==2.16.0
 tinycss2==1.3.0

package_build/ml-pipelines-sdk/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=72", "wheel", "tomli"]
+requires = ["setuptools==70", "wheel", "tomli"]
 build-backend = "setuptools.build_meta"
 
 [project]

package_build/tfx/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=72", "wheel", "tomli"]
+requires = ["setuptools==70", "wheel", "tomli"]
 build-backend = "setuptools.build_meta"
 
 [project]

patches/BUILD

@@ -0,0 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
+exports_files([
+    "tensorflow_metadata_proto_v0.patch",
+])

patches/tensorflow_metadata_proto_v0.patch

@@ -0,0 +1,58 @@
+diff --git a/tensorflow_metadata/proto/v0/BUILD b/tensorflow_metadata/proto/v0/BUILD
+index 24cf416..9e426aa 100644
+--- a/tensorflow_metadata/proto/v0/BUILD
++++ b/tensorflow_metadata/proto/v0/BUILD
+@@ -14,8 +14,6 @@
+ # ==============================================================================
+
+
+-load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
+-
+ licenses(["notice"])  # Apache 2.0
+
+ package(default_visibility = ["//visibility:public"])
+@@ -24,26 +22,20 @@ proto_library(
+     name = "metadata_v0_proto",
+     srcs = [
+         "anomalies.proto",
+-        "derived_feature.proto",
+         "metric.proto",
+         "path.proto",
+         "problem_statement.proto",
+         "schema.proto",
+         "statistics.proto",
++        "derived_feature.proto"
+     ],
+     deps = [
+         # For well-known proto types like protobuf.Any.
+         "@com_google_protobuf//:any_proto",
+-        "@com_google_protobuf//:api_proto",
+-        "@com_google_protobuf//:compiler_plugin_proto",
+         "@com_google_protobuf//:descriptor_proto",
+         "@com_google_protobuf//:duration_proto",
+-        "@com_google_protobuf//:empty_proto",
+-        "@com_google_protobuf//:field_mask_proto",
+-        "@com_google_protobuf//:source_context_proto",
+         "@com_google_protobuf//:struct_proto",
+         "@com_google_protobuf//:timestamp_proto",
+-        "@com_google_protobuf//:type_proto",
+         "@com_google_protobuf//:wrappers_proto",
+     ],
+ )
+@@ -60,10 +52,12 @@ cc_library(
+     deps = [":cc_metadata_v0_proto_cc"],
+ )
+
+-py_proto_library(
++alias(
+     name = "metadata_v0_proto_py_pb2",
+-    deps = [
+-        ":metadata_v0_proto",
+-    ],
++    actual = ":metadata_v0_proto",
+ )
+
++alias(
++    name = "metadata_v0_proto_py_pb2_genproto",
++    actual = ":metadata_v0_proto",
++)