Skip to content

Commit c2d82d8

Browse files
committed
Upgrade tensorflow to v2.20.0 and flatbuffers
Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 41345c8 commit c2d82d8

11 files changed

+528
-58
lines changed
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
diff --git a/BUILD.bazel b/BUILD.bazel
2+
index b4f015a0..70848962 100644
3+
--- a/BUILD.bazel
4+
+++ b/BUILD.bazel
5+
@@ -1,5 +1,3 @@
6+
-load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
7+
-load("@npm//:defs.bzl", "npm_link_all_packages")
8+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
9+
10+
licenses(["notice"])
11+
@@ -8,12 +6,7 @@ package(
12+
default_visibility = ["//visibility:public"],
13+
)
14+
15+
-npm_link_all_packages(name = "node_modules")
16+
17+
-npm_link_package(
18+
- name = "node_modules/flatbuffers",
19+
- src = "//ts:flatbuffers",
20+
-)
21+
22+
exports_files([
23+
"LICENSE",
24+
@@ -40,11 +33,9 @@ filegroup(
25+
"BUILD.bazel",
26+
"WORKSPACE",
27+
"build_defs.bzl",
28+
- "typescript.bzl",
29+
"//grpc/src/compiler:distribution",
30+
"//reflection:distribution",
31+
"//src:distribution",
32+
- "//ts:distribution",
33+
] + glob([
34+
"include/flatbuffers/*.h",
35+
]),
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
diff --git a/third_party/xla/third_party/gpus/cuda_configure.bzl b/third_party/xla/third_party/gpus/cuda_configure.bzl
2+
index d110fa81460..80fccbfa234 100644
3+
--- a/third_party/xla/third_party/gpus/cuda_configure.bzl
4+
+++ b/third_party/xla/third_party/gpus/cuda_configure.bzl
5+
@@ -278,7 +278,7 @@ def _cuda_include_path(repository_ctx, cuda_config):
6+
7+
def enable_cuda(repository_ctx):
8+
"""Returns whether to build with CUDA support."""
9+
- return int(get_host_environ(repository_ctx, "TF_NEED_CUDA", False))
10+
+ return int(False)
11+
12+
def matches_version(environ_version, detected_version):
13+
"""Checks whether the user-specified version matches the detected version.
14+
diff --git a/third_party/xla/third_party/gpus/rocm_configure.bzl b/third_party/xla/third_party/gpus/rocm_configure.bzl
15+
index 80c151cde4d..b044e061473 100644
16+
--- a/third_party/xla/third_party/gpus/rocm_configure.bzl
17+
+++ b/third_party/xla/third_party/gpus/rocm_configure.bzl
18+
@@ -158,12 +158,6 @@ def _rocm_include_path(repository_ctx, rocm_config, bash_bin):
19+
return inc_dirs
20+
21+
def _enable_rocm(repository_ctx):
22+
- enable_rocm = get_host_environ(repository_ctx, "TF_NEED_ROCM")
23+
- if enable_rocm == "1":
24+
- if get_cpu_value(repository_ctx) != "Linux":
25+
- auto_configure_warning("ROCm configure is only supported on Linux")
26+
- return False
27+
- return True
28+
return False
29+
30+
def _amdgpu_targets(repository_ctx, rocm_toolkit_path, bash_bin):
31+
diff --git a/third_party/xla/third_party/gpus/sycl_configure.bzl b/third_party/xla/third_party/gpus/sycl_configure.bzl
32+
index ee63624f8e4..d60a10b10d6 100644
33+
--- a/third_party/xla/third_party/gpus/sycl_configure.bzl
34+
+++ b/third_party/xla/third_party/gpus/sycl_configure.bzl
35+
@@ -63,7 +63,7 @@ def _sycl_include_path(repository_ctx, sycl_config, bash_bin):
36+
37+
def enable_sycl(repository_ctx):
38+
"""Returns whether to build with SYCL support."""
39+
- return int(get_host_environ(repository_ctx, "TF_NEED_SYCL", False))
40+
+ return int(False)
41+
42+
def auto_configure_fail(msg):
43+
"""Output failure message when auto configuration fails."""
44+
diff --git a/third_party/xla/third_party/tensorrt/tensorrt_configure.bzl b/third_party/xla/third_party/tensorrt/tensorrt_configure.bzl
45+
index 32c6d96f161..169df9b2a8b 100644
46+
--- a/third_party/xla/third_party/tensorrt/tensorrt_configure.bzl
47+
+++ b/third_party/xla/third_party/tensorrt/tensorrt_configure.bzl
48+
@@ -154,7 +154,7 @@ def _create_dummy_repository(repository_ctx):
49+
50+
def enable_tensorrt(repository_ctx):
51+
"""Returns whether to build with TensorRT support."""
52+
- return int(get_host_environ(repository_ctx, _TF_NEED_TENSORRT, False))
53+
+ return int(False)
54+
55+
def _get_tensorrt_static_path(repository_ctx):
56+
"""Returns the path for TensorRT static libraries."""
57+
@@ -284,7 +284,7 @@ def _py_tmpl_dict(d):
58+
def _tensorrt_configure_impl(repository_ctx):
59+
"""Implementation of the tensorrt_configure repository rule."""
60+
61+
- if get_host_environ(repository_ctx, _TF_TENSORRT_CONFIG_REPO) != None:
62+
+ if False:
63+
# Forward to the pre-configured remote repository.
64+
remote_config_repo = repository_ctx.os.environ[_TF_TENSORRT_CONFIG_REPO]
65+
repository_ctx.template("BUILD", config_repo_label(remote_config_repo, ":BUILD"), {})
Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,67 @@
1+
diff --git a/tensorflow/workspace1.bzl b/tensorflow/workspace1.bzl
2+
index b6755a6e68b..9d6562457b5 100644
3+
--- a/tensorflow/workspace1.bzl
4+
+++ b/tensorflow/workspace1.bzl
5+
@@ -4,7 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
6+
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
7+
load("@com_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps")
8+
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
9+
-load("@local_xla//third_party/llvm:setup.bzl", "llvm_setup")
10+
+# load("@local_xla//third_party/llvm:setup.bzl", "llvm_setup")
11+
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
12+
load("//third_party/android:android_configure.bzl", "android_configure")
13+
14+
@@ -15,7 +15,7 @@ def workspace(with_rules_cc = True):
15+
Args:
16+
with_rules_cc: Unused, to be removed soon.
17+
"""
18+
- llvm_setup(name = "llvm-project")
19+
+ # llvm_setup(name = "llvm-project")
20+
# native.register_toolchains("@local_config_python//:py_toolchain")
21+
rules_pkg_dependencies()
22+
123
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
2-
index 18b63ab47fb..92993d7c341 100644
24+
index e91df06041d..ce281ccf21c 100644
325
--- a/tensorflow/workspace2.bzl
426
+++ b/tensorflow/workspace2.bzl
5-
@@ -14,7 +14,7 @@ load("//tensorflow/tools/toolchains/embedded/arm-linux:arm_linux_toolchain_confi
6-
load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
7-
load("//third_party/clang_toolchain:cc_configure_clang.bzl", "cc_download_clang_toolchain")
8-
load("//tensorflow/tools/def_file_filter:def_file_filter_configure.bzl", "def_file_filter_configure")
9-
-load("//third_party/llvm:setup.bzl", "llvm_setup")
10-
+#load("//third_party/llvm:setup.bzl", "llvm_setup")
27+
@@ -475,7 +475,7 @@ def _tf_repositories():
1128

12-
# Import third party repository rules. See go/tfbr-thirdparty.
13-
load("//third_party/FP16:workspace.bzl", FP16 = "repo")
14-
@@ -530,7 +530,7 @@ def _tf_repositories():
15-
urls = tf_mirror_urls("https://github.com/antirez/linenoise/archive/4ce393a66b10903a0ef52edf9775ed526a17395f.tar.gz"),
16-
)
29+
# Load the raw llvm-project. llvm does not have build rules set up by default,
30+
# but provides a script for setting up build rules via overlays.
31+
- llvm("llvm-raw")
32+
+ # llvm("llvm-raw")
1733

34+
# Intel openMP that is part of LLVM sources.
35+
tf_http_archive(
36+
diff --git a/third_party/xla/workspace1.bzl b/third_party/xla/workspace1.bzl
37+
index 05121708fc5..dfc5f2cedf3 100644
38+
--- a/third_party/xla/workspace1.bzl
39+
+++ b/third_party/xla/workspace1.bzl
40+
@@ -4,12 +4,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
41+
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
42+
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
43+
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
44+
-load("//third_party/llvm:setup.bzl", "llvm_setup")
45+
+# load("//third_party/llvm:setup.bzl", "llvm_setup")
46+
47+
# buildifier: disable=unnamed-macro
48+
def workspace():
49+
"""Loads a set of TensorFlow dependencies in a WORKSPACE file."""
1850
- llvm_setup(name = "llvm-project")
1951
+ # llvm_setup(name = "llvm-project")
52+
native.register_toolchains("@local_config_python//:py_toolchain")
53+
rules_pkg_dependencies()
2054

21-
# Intel openMP that is part of LLVM sources.
22-
tf_http_archive(
23-
diff --git a/tensorflow/workspace3.bzl b/tensorflow/workspace3.bzl
24-
index a6c2c5c5835..3866493fcc9 100644
25-
--- a/tensorflow/workspace3.bzl
26-
+++ b/tensorflow/workspace3.bzl
27-
@@ -38,7 +38,7 @@ def workspace():
55+
diff --git a/third_party/xla/workspace2.bzl b/third_party/xla/workspace2.bzl
56+
index 9e4166034d0..d34f643bd3f 100644
57+
--- a/third_party/xla/workspace2.bzl
58+
+++ b/third_party/xla/workspace2.bzl
59+
@@ -376,7 +376,7 @@ def _tf_repositories():
2860

2961
# Load the raw llvm-project. llvm does not have build rules set up by default,
3062
# but provides a script for setting up build rules via overlays.
3163
- llvm("llvm-raw")
3264
+ # llvm("llvm-raw")
3365

34-
# Alias so it can be loaded without assigning to a different symbol to prevent
35-
# shadowing previous loads and trigger a buildifier warning.
66+
# Intel openMP that is part of LLVM sources.
67+
tf_http_archive(

0 commit comments

Comments
 (0)