From 3c5472b349607edc6fefb1417d9e913804387d80 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Mon, 30 Oct 2023 14:57:16 -0700 Subject: [PATCH] Upgrade Abseil to latest LTS branch (lts_2023_08_0). PiperOrigin-RevId: 577965860 --- .../absl/absl_designated_initializers.patch | 65 ------------------- third_party/absl/workspace.bzl | 7 +- tools/def_file_filter/def_file_filter.py.tpl | 6 +- 3 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 third_party/absl/absl_designated_initializers.patch diff --git a/third_party/absl/absl_designated_initializers.patch b/third_party/absl/absl_designated_initializers.patch deleted file mode 100644 index 6ee232238..000000000 --- a/third_party/absl/absl_designated_initializers.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/absl/crc/internal/crc_memcpy_x86_64.cc b/absl/crc/internal/crc_memcpy_x86_64.cc -index 66f784de..ff424c54 100644 ---- a/absl/crc/internal/crc_memcpy_x86_64.cc -+++ b/absl/crc/internal/crc_memcpy_x86_64.cc -@@ -359,18 +359,18 @@ CrcMemcpy::ArchSpecificEngines CrcMemcpy::GetArchSpecificEngines() { - case CpuType::kIntelHaswell: - case CpuType::kIntelIvybridge: - return { -- .temporal = new FallbackCrcMemcpyEngine(), -- .non_temporal = new CrcNonTemporalMemcpyAVXEngine(), -+ /*.temporal=*/new FallbackCrcMemcpyEngine(), -+ /*.non_temporal=*/new CrcNonTemporalMemcpyAVXEngine(), - }; - // INTEL_SANDYBRIDGE performs better with SSE than AVX. - case CpuType::kIntelSandybridge: - return { -- .temporal = new FallbackCrcMemcpyEngine(), -- .non_temporal = new CrcNonTemporalMemcpyEngine(), -+ /*.temporal=*/new FallbackCrcMemcpyEngine(), -+ /*.non_temporal=*/new CrcNonTemporalMemcpyEngine(), - }; - default: -- return {.temporal = new FallbackCrcMemcpyEngine(), -- .non_temporal = new FallbackCrcMemcpyEngine()}; -+ return {/*.temporal=*/new FallbackCrcMemcpyEngine(), -+ /*.non_temporal=*/new FallbackCrcMemcpyEngine()}; - } - #else - // Get the underlying architecture. -@@ -388,8 +388,8 @@ CrcMemcpy::ArchSpecificEngines CrcMemcpy::GetArchSpecificEngines() { - case CpuType::kAmdRome: - case CpuType::kAmdNaples: - return { -- .temporal = new AcceleratedCrcMemcpyEngine<1, 2>(), -- .non_temporal = new CrcNonTemporalMemcpyAVXEngine(), -+ /*.temporal=*/new AcceleratedCrcMemcpyEngine<1, 2>(), -+ /*.non_temporal=*/new CrcNonTemporalMemcpyAVXEngine(), - }; - // PCLMULQDQ is slow and we don't have wide enough issue width to take - // advantage of it. For an unknown architecture, don't risk using CLMULs. -@@ -400,18 +400,18 @@ CrcMemcpy::ArchSpecificEngines CrcMemcpy::GetArchSpecificEngines() { - case CpuType::kIntelHaswell: - case CpuType::kIntelIvybridge: - return { -- .temporal = new AcceleratedCrcMemcpyEngine<3, 0>(), -- .non_temporal = new CrcNonTemporalMemcpyAVXEngine(), -+ /*.temporal=*/new AcceleratedCrcMemcpyEngine<3, 0>(), -+ /*.non_temporal=*/new CrcNonTemporalMemcpyAVXEngine(), - }; - // INTEL_SANDYBRIDGE performs better with SSE than AVX. - case CpuType::kIntelSandybridge: - return { -- .temporal = new AcceleratedCrcMemcpyEngine<3, 0>(), -- .non_temporal = new CrcNonTemporalMemcpyEngine(), -+ /*.temporal=*/new AcceleratedCrcMemcpyEngine<3, 0>(), -+ /*.non_temporal=*/new CrcNonTemporalMemcpyEngine(), - }; - default: -- return {.temporal = new FallbackCrcMemcpyEngine(), -- .non_temporal = new FallbackCrcMemcpyEngine()}; -+ return {/*.temporal=*/new FallbackCrcMemcpyEngine(), -+ /*.non_temporal=*/new FallbackCrcMemcpyEngine()}; - } - #endif // UNDEFINED_BEHAVIOR_SANITIZER - } diff --git a/third_party/absl/workspace.bzl b/third_party/absl/workspace.bzl index 07f49cebb..06f75166c 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 = "b971ac5250ea8de900eae9f95e06548d14cd95fe" - ABSL_SHA256 = "8eeec9382fc0338ef5c60053f3a4b0e0708361375fe51c9e65d0ce46ccfe55a7" + ABSL_COMMIT = "fb3621f4f897824c0dbe0615fa94543df6192f30" + ABSL_SHA256 = "0320586856674d16b0b7a4d4afb22151bdc798490bb7f295eddd8f6a62b46fea" # LINT.ThenChange(//tensorflow/lite/tools/cmake/modules/abseil-cpp.cmake) SYS_DIRS = [ @@ -42,9 +42,6 @@ def repo(): build_file = "//third_party/absl:com_google_absl.BUILD", system_build_file = "//third_party/absl:system.BUILD", system_link_files = SYS_LINKS, - # This patch pulls in a fix for designated initializers that MSVC - # complains about. It shouldn't be necessary at the next LTS release. - patch_file = ["//third_party/absl:absl_designated_initializers.patch"], 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)), ) diff --git a/tools/def_file_filter/def_file_filter.py.tpl b/tools/def_file_filter/def_file_filter.py.tpl index 18426a4ee..4091a5713 100644 --- a/tools/def_file_filter/def_file_filter.py.tpl +++ b/tools/def_file_filter/def_file_filter.py.tpl @@ -300,8 +300,8 @@ def main(): def_fp.write("\t ??_7ConfigProto@tensorflow@@6B@\n") # for _pywrap_tfe def_fp.write("\t ??_7CoordinatedTask@tensorflow@@6B@\n") # for _pywrap_tfe def_fp.write("\t ?InternalSwap@CoordinatedTask@tensorflow@@AEAAXPEAV12@@Z\n") # for _pywrap_tfe - def_fp.write("\t ?kSeed@MixingHashState@hash_internal@lts_20230125@absl@@0QEBXEB\n") # for _pywrap_tfcompile - def_fp.write("\t ?kEmptyGroup@container_internal@lts_20230125@absl@@3QBW4ctrl_t@123@B\n") # for _pywrap_tfcompile + def_fp.write("\t ?kSeed@MixingHashState@hash_internal@lts_20230802@absl@@0QEBXEB\n") # for _pywrap_tfcompile + def_fp.write("\t ?kEmptyGroup@container_internal@lts_20230802@absl@@3QBW4ctrl_t@123@B\n") # for _pywrap_tfcompile def_fp.write("\t ??_7GraphDef@tensorflow@@6B@\n") def_fp.write("\t ??_7DeviceProperties@tensorflow@@6B@\n") def_fp.write("\t ??_7MetaGraphDef@tensorflow@@6B@\n") @@ -310,7 +310,7 @@ def main(): def_fp.write("\t ??1CoordinatedTask@tensorflow@@UEAA@XZ\n") # for _pywrap_tfe def_fp.write("\t ?CopyFrom@CoordinatedTask@tensorflow@@QEAAXAEBV12@@Z\n") # for _pywrap_tfe def_fp.write("\t ??0CoordinatedTask@tensorflow@@IEAA@PEAVArena@protobuf@google@@_N@Z\n") # for _pywrap_tfe - def_fp.write("\t ?MaybeTrackCordImpl@CordzInfo@cord_internal@lts_20230125@absl@@CAXAEAVInlineData@234@AEBV5234@W4MethodIdentifier@CordzUpdateTracker@234@@Z\n") # for tensorflow::Status usage of absl::Cord + def_fp.write("\t ?MaybeTrackCordImpl@CordzInfo@cord_internal@lts_20230802@absl@@CAXAEAVInlineData@234@AEBV5234@W4MethodIdentifier@CordzUpdateTracker@234@@Z\n") # for tensorflow::Status usage of absl::Cord # Each symbols returned by undname matches the same position in candidates.