Fixes for 8th Wall builds

8thwall · Sep 2, 2021 · 8926413 · 8926413
1 parent 7729668
commit 8926413
Show file tree

Hide file tree

Showing 8 changed files with 6,678 additions and 2,393 deletions.
diff --git a/tensorflow/lite/build_def.bzl b/tensorflow/lite/build_def.bzl
@@ -18,6 +18,7 @@ def tflite_copts():
         "-DFARMHASH_NO_CXX_STRING",
         "-Wno-deprecated-declarations",
         "-Wno-unused-function",
+        "-Wno-unused-but-set-variable",
     ] + select({
         clean_dep("//tensorflow:android_arm"): [
             "-mfpu=neon",

diff --git a/tensorflow/lite/delegates/xnnpack/BUILD b/tensorflow/lite/delegates/xnnpack/BUILD
@@ -52,7 +52,10 @@ cc_library(
     name = "xnnpack_delegate_test_mode",
     srcs = ["xnnpack_delegate.cc"],
     hdrs = ["xnnpack_delegate.h"],
-    copts = ["-DXNNPACK_DELEGATE_TEST_MODE=1"],
+    copts = [
+        "-DXNNPACK_DELEGATE_TEST_MODE=1",
+        "-Wno-unused-but-set-variable",
+    ],
     linkstatic = True,
     deps = [
         ":quantization_util",

diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
@@ -127,6 +127,7 @@ def _tf_repositories():
     # and update the sha256 with the result.
     tf_http_archive(
         name = "XNNPACK",
+        build_file = "//third_party:xnnpack.BUILD",
         sha256 = "e1fee5a16e4a06d3bd77ab33cf87b1c6d826715906248a308ab790486198d3c9",
         strip_prefix = "XNNPACK-476eb84d6a8e6f8249d5584d30759c6fbdbf791d",
         urls = [
@@ -331,18 +332,18 @@ def _tf_repositories():
         ],
     )
 
-    tf_http_archive(
-        name = "png",
-        build_file = "//third_party:png.BUILD",
-        patch_file = "//third_party:png_fix_rpi.patch",
-        sha256 = "ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307",
-        strip_prefix = "libpng-1.6.37",
-        system_build_file = "//third_party/systemlibs:png.BUILD",
-        urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/github.com/glennrp/libpng/archive/v1.6.37.tar.gz",
-            "https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz",
-        ],
-    )
+    # tf_http_archive(
+    #     name = "png",
+    #     build_file = "//third_party:png.BUILD",
+    #     patch_file = "//third_party:png_fix_rpi.patch",
+    #     sha256 = "ca74a0dace179a8422187671aee97dd3892b53e168627145271cad5b5ac81307",
+    #     strip_prefix = "libpng-1.6.37",
+    #     system_build_file = "//third_party/systemlibs:png.BUILD",
+    #     urls = [
+    #         "https://storage.googleapis.com/mirror.tensorflow.org/github.com/glennrp/libpng/archive/v1.6.37.tar.gz",
+    #         "https://github.com/glennrp/libpng/archive/v1.6.37.tar.gz",
+    #     ],
+    # )
 
     tf_http_archive(
         name = "org_sqlite",
@@ -703,17 +704,17 @@ def _tf_repositories():
         ],
     )
 
-    tf_http_archive(
-        name = "zlib",
-        build_file = "//third_party:zlib.BUILD",
-        sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
-        strip_prefix = "zlib-1.2.11",
-        system_build_file = "//third_party/systemlibs:zlib.BUILD",
-        urls = [
-            "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.11.tar.gz",
-            "https://zlib.net/zlib-1.2.11.tar.gz",
-        ],
-    )
+    #  tf_http_archive(
+    #      name = "zlib",
+    #      build_file = "//third_party:zlib.BUILD",
+    #      sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
+    #      strip_prefix = "zlib-1.2.11",
+    #      system_build_file = "//third_party/systemlibs:zlib.BUILD",
+    #      urls = [
+    #          "https://storage.googleapis.com/mirror.tensorflow.org/zlib.net/zlib-1.2.11.tar.gz",
+    #          "https://zlib.net/zlib-1.2.11.tar.gz",
+    #      ],
+    #  )
 
     tf_http_archive(
         name = "fft2d",

diff --git a/third_party/cpuinfo/workspace.bzl b/third_party/cpuinfo/workspace.bzl
@@ -22,5 +22,5 @@ def repo():
 #            "https://github.com/pytorch/cpuinfo/archive/d6c0f915ee737f961915c9d17f1679b6777af207.tar.gz",
         ],
         build_file = "//third_party/cpuinfo:BUILD.bazel",
-        patch_file = clean_dep("//third_party/cpuinfo:cpuinfo.patch"),
+#        patch_file = clean_dep("//third_party/cpuinfo:cpuinfo.patch"),
     )
diff --git a/third_party/tf_runtime/8thwall-tf_runtime.patch b/third_party/tf_runtime/8thwall-tf_runtime.patch
@@ -0,0 +1,19 @@
+--- runtime/third_party/cuda/dependencies.bzl	2021-06-25 06:39:16.000000000 -0700
++++ runtime/third_party/cuda/dependencies.bzl	2021-09-02 13:00:44.000000000 -0700
+@@ -48,11 +48,11 @@
+ )
+
+ def cuda_dependencies():
+-    print("The following command will download NVIDIA proprietary " +
+-          "software. By using the software you agree to comply with the " +
+-          "terms of the license agreement that accompanies the software. " +
+-          "If you do not agree to the terms of the license agreement, do " +
+-          "not use the software.")
++    # print("The following command will download NVIDIA proprietary " +
++    #       "software. By using the software you agree to comply with the " +
++    #       "terms of the license agreement that accompanies the software. " +
++    #       "If you do not agree to the terms of the license agreement, do " +
++    #       "not use the software.")
+
+     _cuda_headers(name = "cuda_headers")
+     _cudnn_headers(name = "cudnn_headers")
diff --git a/third_party/tf_runtime/workspace.bzl b/third_party/tf_runtime/workspace.bzl
@@ -13,6 +13,7 @@ def repo():
         name = "tf_runtime",
         sha256 = TFRT_SHA256,
         strip_prefix = "runtime-{commit}".format(commit = TFRT_COMMIT),
+        patch_file = "//third_party:tf_runtime/8thwall-tf_runtime.patch",
         urls = [
             "http://mirror.tensorflow.org/github.com/tensorflow/runtime/archive/{commit}.tar.gz".format(commit = TFRT_COMMIT),
             "https://github.com/tensorflow/runtime/archive/{commit}.tar.gz".format(commit = TFRT_COMMIT),