From a31a3689098e26dd9c3aebcbffa653b1d77071a6 Mon Sep 17 00:00:00 2001 From: DavidKorczynski Date: Tue, 21 Mar 2023 12:54:21 +0000 Subject: [PATCH] tensorflow: clean-up patch (#9969) Following https://github.com/google/benchmark/pull/1579 we no longer need to set benchmark to an earlier version for the build to succeed. Signed-off-by: David Korczynski --- projects/tensorflow/fuzz_patch.patch | 59 ---------------------------- 1 file changed, 59 deletions(-) diff --git a/projects/tensorflow/fuzz_patch.patch b/projects/tensorflow/fuzz_patch.patch index bb0307bd2..15de63cff 100644 --- a/projects/tensorflow/fuzz_patch.patch +++ b/projects/tensorflow/fuzz_patch.patch @@ -75,62 +75,3 @@ index 9223d294..f2c795b3 100644 # tf_cc_fuzz_test is a cc_test modified to include fuzzing support and dependencies for go/fuzztest. def tf_cc_fuzz_test( name, -diff --git a/tensorflow/workspace0.bzl b/tensorflow/workspace0.bzl -index d8b53e1e..8baf28d3 100644 ---- a/tensorflow/workspace0.bzl -+++ b/tensorflow/workspace0.bzl -@@ -8,7 +8,7 @@ load("@build_bazel_rules_swift//swift:repositories.bzl", "swift_rules_dependenci - load("@build_bazel_apple_support//lib:repositories.bzl", "apple_support_dependencies") - load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") - load("@local_config_android//:android.bzl", "android_workspace") --load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") -+#load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") - - def _tf_bind(): - """Bind targets for some external repositories""" -@@ -133,7 +133,7 @@ def workspace(): - _tf_bind() - - grpc_extra_deps() -- rules_foreign_cc_dependencies() -+ #rules_foreign_cc_dependencies() - config_googleapis() - - # Alias so it can be loaded without assigning to a different symbol to prevent -diff --git a/tensorflow/workspace1.bzl b/tensorflow/workspace1.bzl -index c74a2e13..c9dd0576 100644 ---- a/tensorflow/workspace1.bzl -+++ b/tensorflow/workspace1.bzl -@@ -3,7 +3,7 @@ - load("//third_party/android:android_configure.bzl", "android_configure") - load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") --load("@com_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps") -+#load("@com_google_benchmark//:bazel/benchmark_deps.bzl", "benchmark_deps") - load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") - load("@rules_cuda//cuda:dependencies.bzl", "rules_cuda_dependencies") - load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") -@@ -34,7 +34,7 @@ def workspace(with_rules_cc = True): - android_configure(name = "local_config_android") - - grpc_deps() -- benchmark_deps() -+ #benchmark_deps() - - # Alias so it can be loaded without assigning to a different symbol to prevent - # shadowing previous loads and trigger a buildifier warning. -diff --git a/third_party/benchmark/workspace.bzl b/third_party/benchmark/workspace.bzl -index d5b2bb64..9b1deb57 100644 ---- a/third_party/benchmark/workspace.bzl -+++ b/third_party/benchmark/workspace.bzl -@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls") - - def repo(): - """Imports benchmark.""" -- BM_COMMIT = "4b086c26febc39f4636d82a436fd445b9af9501b" -- BM_SHA256 = "51478d437e82a51f36ca9071fa9bac2e10455bb1ffee85ccf367bd607487ef09" -+ BM_COMMIT = "361e8d1cfe0c6c36d30b39f1b61302ece5507320" -+ BM_SHA256 = "3a43368d3ec48afe784573cf962fe98c084e89a1e3d176c00715a84366316e7d" - tf_http_archive( - name = "com_google_benchmark", - sha256 = BM_SHA256,