Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with TF 2.14 #2856

Merged
merged 4 commits into from
Nov 20, 2023
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
9 changes: 6 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ tf_configure(

http_archive(
name = "org_tensorflow",
sha256 = "c030cb1905bff1d2446615992aad8d8d85cbe90c4fb625cee458c63bf466bc8e",
strip_prefix = "tensorflow-2.12.0",
patches = [
"//build_deps/tf_dependency:tf.patch",
],
sha256 = "ce357fd0728f0d1b0831d1653f475591662ec5bca736a94ff789e6b1944df19f",
strip_prefix = "tensorflow-2.14.0",
urls = [
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.12.0.tar.gz",
"https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.14.0.tar.gz",
],
)

Expand Down
74 changes: 74 additions & 0 deletions build_deps/tf_dependency/tf.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
diff --git tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
Copy link
Contributor

@bhack bhack Nov 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@seanpmorgan NIP: There could be the risk that this will be invalidated on 2.15 and we need to manually regenerate that patch on new releases.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but it appears that other repos (e.g. tf/federated) depend on this too so I'm okay with trying this strategy for the couple of releases we have left

index a2bdd6a7eed..ec25c23d8d4 100644
--- tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
+++ tensorflow/tools/toolchains/cpus/aarch64/aarch64_compiler_configure.bzl
@@ -2,7 +2,7 @@

load("//tensorflow/tools/toolchains:cpus/aarch64/aarch64.bzl", "remote_aarch64_configure")
load("//third_party/remote_config:remote_platform_configure.bzl", "remote_platform_configure")
-load("//third_party/py:python_configure.bzl", "remote_python_configure")
+load("//third_party/py/non_hermetic:python_configure.bzl", "remote_python_configure")

def ml2014_tf_aarch64_configs(name_container_map, env):
for name, container in name_container_map.items():
diff --git tensorflow/tools/toolchains/remote_config/rbe_config.bzl tensorflow/tools/toolchains/remote_config/rbe_config.bzl
index 9f71a414bf7..57f70752323 100644
--- tensorflow/tools/toolchains/remote_config/rbe_config.bzl
+++ tensorflow/tools/toolchains/remote_config/rbe_config.bzl
@@ -1,6 +1,6 @@
"""Macro that creates external repositories for remote config."""

-load("//third_party/py:python_configure.bzl", "local_python_configure", "remote_python_configure")
+load("//third_party/py/non_hermetic:python_configure.bzl", "local_python_configure", "remote_python_configure")
load("//third_party/gpus:cuda_configure.bzl", "remote_cuda_configure")
load("//third_party/nccl:nccl_configure.bzl", "remote_nccl_configure")
load("//third_party/gpus:rocm_configure.bzl", "remote_rocm_configure")
diff --git tensorflow/workspace2.bzl tensorflow/workspace2.bzl
index 7e9faa558a4..5b18cb0969a 100644
--- tensorflow/workspace2.bzl
+++ tensorflow/workspace2.bzl
@@ -8,7 +8,7 @@ load("//third_party/gpus:rocm_configure.bzl", "rocm_configure")
load("//third_party/tensorrt:tensorrt_configure.bzl", "tensorrt_configure")
load("//third_party/nccl:nccl_configure.bzl", "nccl_configure")
load("//third_party/git:git_configure.bzl", "git_configure")
-load("//third_party/py:python_configure.bzl", "python_configure")
+load("//third_party/py/non_hermetic:python_configure.bzl", "python_configure")
load("//third_party/systemlibs:syslibs_configure.bzl", "syslibs_configure")
load("//tensorflow/tools/toolchains:cpus/aarch64/aarch64_compiler_configure.bzl", "aarch64_compiler_configure")
load("//tensorflow/tools/toolchains:cpus/arm/arm_compiler_configure.bzl", "arm_compiler_configure")
diff --git third_party/py/non_hermetic/python_configure.bzl third_party/py/non_hermetic/python_configure.bzl
index 300cbfb6c71..09d98505dd9 100644
--- third_party/py/non_hermetic/python_configure.bzl
+++ third_party/py/non_hermetic/python_configure.bzl
@@ -206,7 +206,7 @@ def _create_local_python_repository(repository_ctx):
# Resolve all labels before doing any real work. Resolving causes the
# function to be restarted with all previous state being lost. This
# can easily lead to a O(n^2) runtime in the number of labels.
- build_tpl = repository_ctx.path(Label("//third_party/py:BUILD.tpl"))
+ build_tpl = repository_ctx.path(Label("//third_party/py/non_hermetic:BUILD.tpl"))

python_bin = get_python_bin(repository_ctx)
_check_python_bin(repository_ctx, python_bin)
diff --git third_party/py/numpy/BUILD third_party/py/numpy/BUILD
index 97c7907fc38..c80cc5287bc 100644
--- third_party/py/numpy/BUILD
+++ third_party/py/numpy/BUILD
@@ -2,14 +2,15 @@ licenses(["restricted"])

package(default_visibility = ["//visibility:public"])

-alias(
+py_library(
name = "numpy",
- actual = "@pypi_numpy//:pkg",
+ srcs = ["tf_numpy_dummy.py"],
+ srcs_version = "PY3",
)

alias(
name = "headers",
- actual = "@pypi_numpy//:numpy_headers",
+ actual = "@local_config_python//:numpy_headers",
)

genrule(
Loading