diff --git a/third_party/absl/nvidia_jetson.patch b/third_party/absl/nvidia_jetson.patch deleted file mode 100644 index 5328c3a0d..000000000 --- a/third_party/absl/nvidia_jetson.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 372124e6af36a540e74a2ec31d79d7297a831f98 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Bastien?= -Date: Thu, 1 Aug 2024 12:38:52 -0700 -Subject: [PATCH] PR #1732: Fix build on NVIDIA Jetson board. Fix #1665 - -Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1732 - -Fix build on NVIDIA Jetson board. Fix #1665 - -This patch is already used by the spark project. -I'm fixing this as this break the build of Tensorflow and JAX on Jetson board. -Merge 7db2d2ab9fbed1f0fabad10a6ec73533ba71bfff into 6b8ebb35c0414ef5a2b6fd4a0f59057e41beaff9 - -Merging this change closes #1732 - -COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1732 from nouiz:fix_neon_on_jetson 7db2d2ab9fbed1f0fabad10a6ec73533ba71bfff -PiperOrigin-RevId: 658501520 -Change-Id: If502ede4efc8c877fb3fed227eca6dc7622dd181 ---- - absl/base/config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/absl/base/config.h b/absl/base/config.h -index 97c9a22a109..ab1e9860a91 100644 ---- a/absl/base/config.h -+++ b/absl/base/config.h -@@ -926,7 +926,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' || - // https://llvm.org/docs/CompileCudaWithLLVM.html#detecting-clang-vs-nvcc-from-code - #ifdef ABSL_INTERNAL_HAVE_ARM_NEON - #error ABSL_INTERNAL_HAVE_ARM_NEON cannot be directly set --#elif defined(__ARM_NEON) && !defined(__CUDA_ARCH__) -+#elif defined(__ARM_NEON) && !(defined(__NVCC__) && defined(__CUDACC__)) - #define ABSL_INTERNAL_HAVE_ARM_NEON 1 - #endif - diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl index d5973b13b..048db3f22 100644 --- a/third_party/absl/workspace.bzl +++ b/third_party/absl/workspace.bzl @@ -7,8 +7,8 @@ def repo(): # Attention: tools parse and update these lines. # LINT.IfChange - ABSL_COMMIT = "fb3621f4f897824c0dbe0615fa94543df6192f30" - ABSL_SHA256 = "0320586856674d16b0b7a4d4afb22151bdc798490bb7f295eddd8f6a62b46fea" + ABSL_COMMIT = "dd4c89bd657f1e247ce5111a5c89ffe6ccfd0c92" + ABSL_SHA256 = "8dd54939e1905172a12be10e9ea8b7bbf56d8e2c1855955b0d9c9e478b487d6d" # LINT.ThenChange(//tensorflow/lite/tools/cmake/modules/abseil-cpp.cmake) SYS_DIRS = [ @@ -44,7 +44,4 @@ def repo(): system_link_files = SYS_LINKS, strip_prefix = "abseil-cpp-{commit}".format(commit = ABSL_COMMIT), urls = tf_mirror_urls("https://github.com/abseil/abseil-cpp/archive/{commit}.tar.gz".format(commit = ABSL_COMMIT)), - patch_file = [ - "//third_party/absl:nvidia_jetson.patch", - ], )