Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions py3-tensorflow-data-validation.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package:
name: py3-tensorflow-data-validation
version: 1.16.1
epoch: 2
version: "1.17.0"
epoch: 0
description: Library for exploring and validating machine learning data
copyright:
- license: Apache-2.0
resources:
cpu: 32
memory: 40Gi
memory: 128Gi
dependencies:
runtime:
- numpy
Expand All @@ -30,6 +30,7 @@ environment:
- build-base
- busybox
- ca-certificates-bundle
- gcc-14-default
- numpy
- openjdk-11
- patch
Expand All @@ -43,11 +44,12 @@ environment:
- wolfi-base
environment:
JAVA_HOME: /usr/lib/jvm/java-11-openjdk
BAZEL_CXXOPTS: -fdelete-null-pointer-checks

pipeline:
- uses: git-checkout
with:
expected-commit: b7c96d3f65d93efe521a874a669063cf1c327fe8
expected-commit: 33db92f7a7e26c937d9e9f9489f3d2b43dd008ea
repository: https://github.com/tensorflow/data-validation
tag: v${{package.version}}

Expand Down
83 changes: 32 additions & 51 deletions py3-tensorflow-data-validation/0001-fix-build.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/WORKSPACE b/WORKSPACE
index f0119d8..abb1c82 100644
index 71db771..7ce9383 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -69,6 +69,37 @@ load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_
rules_proto_dependencies()
@@ -32,6 +32,37 @@ load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")

rules_proto_toolchains()

+# m4 is used and fetched by zetasql but we want to patch it so load it before calling zetasql_deps_step_2
Expand Down Expand Up @@ -37,72 +37,53 @@ index f0119d8..abb1c82 100644
+ for name in ["six_archive", "six"]
+]
+
# TODO(b/239095455): Change to using a tfx-bsl workspace macro to load these
# dependencies.
# Needed by zetasql.
@@ -86,17 +117,6 @@ http_archive(
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
protobuf_deps()
# Install version 0.9.0 of rules_foreign_cc, as default version causes an
# invalid escape sequence error to be raised, which can't be avoided with
# the --incompatible_restrict_string_escapes=false flag (flag was removed in
@@ -72,16 +103,18 @@ http_archive(
)

-# Needed by abseil-py by zetasql.
# Needed by abseil-py by zetasql.
-http_archive(
- name = "six_archive",
- build_file = "//third_party:six.BUILD",
- sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
- strip_prefix = "six-1.10.0",
- urls = [
- "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
- "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz",
- ],
- sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
- strip_prefix = "six-1.10.0",
- build_file = "//third_party:six.BUILD"
-)
+[
+ http_archive(
+ name = name,
+ urls = [
+ "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.16.0.tar.gz",
+ "https://pypi.python.org/packages/source/s/six/six-1.16.0.tar.gz",
+ ],
+ sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
+ build_file = "@//third_party:six.BUILD",
+ )
+ for name in ["six_archive", "six"]
+]

COM_GOOGLE_ABSL_COMMIT = "92fdbfb301f8b301b28ab5c99e7361e775c2fb8a" # 2022-08-25 Abseil Logging library first release
http_archive(
@@ -150,16 +170,22 @@ load("//tensorflow_data_validation:workspace.bzl", "tf_data_validation_workspace

tf_data_validation_workspace()

-load("@com_github_tfx_bsl//third_party:python_configure.bzl", "local_python_configure")
-local_python_configure(name = "local_config_python")
+http_archive(
+ name = "pybind11_bazel",
+ strip_prefix = "pybind11_bazel-23926b00e2b2eb2fc46b17e587cf0c0cfd2f2c4b",
+ urls = ["https://github.com/pybind/pybind11_bazel/archive/23926b00e2b2eb2fc46b17e587cf0c0cfd2f2c4b.zip"],
+ sha256 = "07e529a85cf4c11e1ca1b423149e86e63a3f3859c22efee3b3c5225ca89580f2"
+)
+load("@pybind11_bazel//:python_configure.bzl", "python_configure")
+python_configure(name = "local_config_python")

-PYBIND11_COMMIT = "8a099e44b3d5f85b20f05828d919d2332a8de841" # 2.11.1
+PYBIND11_COMMIT = "8a099e44b3d5f85b20f05828d919d2332a8de841"
http_archive(
- name = "pybind11",
- build_file = "@com_github_tfx_bsl//third_party:pybind11.BUILD",
- strip_prefix = "pybind11-%s" % PYBIND11_COMMIT,
- urls = ["https://github.com/pybind/pybind11/archive/%s.zip" % PYBIND11_COMMIT],
- sha256 = "8f4b7f28d214e36301435c055076c36186388dc9617117802cba8a059347cb00",
+ name = "pybind11",
+ build_file = "@pybind11_bazel//:pybind11.BUILD",
+ strip_prefix = "pybind11-%s" % PYBIND11_COMMIT,
+ urls = ["https://github.com/pybind/pybind11/archive/%s.zip" % PYBIND11_COMMIT],
+ sha256 = "8f4b7f28d214e36301435c055076c36186388dc9617117802cba8a059347cb00"
)
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

# Specify the minimum required bazel version.
diff --git a/tensorflow_data_validation/workspace.bzl b/tensorflow_data_validation/workspace.bzl
index d6c0ad9..6143779 100644
index 9f67ea5..c6a13be 100644
--- a/tensorflow_data_validation/workspace.bzl
+++ b/tensorflow_data_validation/workspace.bzl
@@ -22,5 +22,5 @@ def tf_data_validation_workspace():
@@ -14,6 +14,6 @@ def tf_data_validation_workspace():

git_repository(
name = "com_github_tfx_bsl",
branch = "master",
- remote = "https://github.com/tensorflow/tfx-bsl",
+ remote = "https://github.com/tensorflow/tfx-bsl.git",
- branch = "master",
+ commit = "1d4b5389b5e65df7a26b3748f68a6399aaea034f",
remote = "https://github.com/tensorflow/tfx-bsl",
)
diff --git a/third_party/m4-cstack.patch b/third_party/m4-cstack.patch
new file mode 100644
index 0000000..259f4bf
index 0000000..9fedf70
--- /dev/null
+++ b/third_party/m4-cstack.patch
@@ -0,0 +1,40 @@
Expand Down
Loading