tjh.dev
1From 0d1e631c365944d54e87bdce39beb13b225ba8f8 Mon Sep 17 00:00:00 2001
2From: Changming Sun <chasun@microsoft.com>
3Date: Thu, 23 May 2024 14:30:15 -0700
4Subject: [PATCH] Update RE2 to the latest (#20775)
5
6Update RE2 to the latest.
7
8To keep the components up to date.
9
10(cherry picked from commit b522df0ae477e59f60acbe6c92c8a64eda96cace)
11---
12 cgmanifests/generated/cgmanifest.json | 2 +-
13 cmake/deps.txt | 4 +--
14 cmake/external/abseil-cpp.cmake | 35 ++++++++++++++++++++++-----
15 cmake/external/helper_functions.cmake | 6 +++++
16 4 files changed, 38 insertions(+), 9 deletions(-)
17
18diff --git a/cgmanifests/generated/cgmanifest.json b/cgmanifests/generated/cgmanifest.json
19index eb74178b3e..e3e9be67ae 100644
20--- a/cgmanifests/generated/cgmanifest.json
21+++ b/cgmanifests/generated/cgmanifest.json
22@@ -276,7 +276,7 @@
23 "component": {
24 "type": "git",
25 "git": {
26- "commitHash": "5723bb8950318135ed9cf4fc76bed988a087f536",
27+ "commitHash": "2b354c6ad0d0479dcff68dab23fb0d1143a482c2",
28 "repositoryUrl": "https://github.com/google/re2.git"
29 },
30 "comments": "re2"
31diff --git a/cmake/deps.txt b/cmake/deps.txt
32index d213b09034..d4d19dea08 100644
33--- a/cmake/deps.txt
34+++ b/cmake/deps.txt
35@@ -50,11 +50,11 @@ psimd;https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e9
36 pthreadpool;https://github.com/Maratyszcza/pthreadpool/archive/4fe0e1e183925bf8cfa6aae24237e724a96479b8.zip;07a0aa91dd9bf86f31b95497e00f31d8a261a4bd
37 pybind11;https://github.com/pybind/pybind11/archive/refs/tags/v2.10.1.zip;769b6aa67a77f17a770960f604b727645b6f6a13
38 pytorch_cpuinfo;https://github.com/pytorch/cpuinfo/archive/959002f82d7962a473d8bf301845f2af720e0aa4.zip;85da3caa60eb2b148613b443fbc2bfdc30689965
39-re2;https://github.com/google/re2/archive/refs/tags/2022-06-01.zip;aa77313b76e91b531ee7f3e45f004c6a502a5374
40+re2;https://github.com/google/re2/archive/refs/tags/2024-05-01.tar.gz;206cfee5ee0b4c6844680ba66275e9e8faa77405
41 safeint;https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.28.zip;23f252040ff6cb9f1fd18575b32fa8fb5928daac
42 tensorboard;https://github.com/tensorflow/tensorboard/archive/373eb09e4c5d2b3cc2493f0949dc4be6b6a45e81.zip;67b833913605a4f3f499894ab11528a702c2b381
43 cutlass;https://github.com/NVIDIA/cutlass/archive/refs/tags/v3.1.0.zip;757f90a795034a89d4f48a79d1f009f7a04c8dee
44 utf8_range;https://github.com/protocolbuffers/utf8_range/archive/72c943dea2b9240cd09efde15191e144bc7c7d38.zip;9925739c9debc0efa2adcb194d371a35b6a03156
45 extensions;https://github.com/microsoft/onnxruntime-extensions/archive/94142d8391c9791ec71c38336436319a2d4ac7a0.zip;4365ac5140338b4cb75a39944a4be276e3829b3c
46 composable_kernel;https://github.com/ROCmSoftwarePlatform/composable_kernel/archive/5356c4a943a35e74d7cdc69486afcb8703b9a59a.zip;522382c2af437e09124287e5879ab64af5b2e299
47-directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e
48\ No newline at end of file
49+directx_headers;https://github.com/microsoft/DirectX-Headers/archive/refs/tags/v1.613.1.zip;47653509a3371eabb156360f42faf582f314bf2e
50diff --git a/cmake/external/abseil-cpp.cmake b/cmake/external/abseil-cpp.cmake
51index 57cfbee464..c01195c99e 100644
52--- a/cmake/external/abseil-cpp.cmake
53+++ b/cmake/external/abseil-cpp.cmake
54@@ -45,10 +45,8 @@ endif()
55
56 # TODO: since multiple ORT's dependencies depend on Abseil, the list below would vary from version to version.
57 # We'd better to not manually manage the list.
58-set(ABSEIL_LIBS absl::base
59+set(ABSEIL_LIBS
60 absl::city
61-absl::core_headers
62-absl::fixed_array
63 absl::flags
64 absl::flat_hash_map
65 absl::flat_hash_set
66@@ -60,9 +58,34 @@ absl::node_hash_set
67 absl::optional
68 absl::raw_hash_set
69 absl::raw_logging_internal
70-absl::span
71 absl::str_format
72-absl::strings
73+absl::str_format_internal
74+absl::bits
75+absl::fixed_array
76+absl::numeric_representation
77+absl::utility
78+absl::type_traits
79+absl::string_view
80+absl::core_headers
81+absl::nullability
82+absl::span
83+absl::config
84 absl::synchronization
85+absl::base
86+absl::civil_time
87+absl::debugging_internal
88+absl::demangle_internal
89+absl::graphcycles_internal
90+absl::int128
91+absl::kernel_timeout_internal
92+absl::log_severity
93+absl::malloc_internal
94+absl::spinlock_wait
95+absl::stacktrace
96+absl::string_view
97+absl::strings
98+absl::strings_internal
99+absl::symbolize
100 absl::throw_delegate
101-absl::time)
102+absl::time
103+absl::time_zone)
104\ No newline at end of file
105diff --git a/cmake/external/helper_functions.cmake b/cmake/external/helper_functions.cmake
106index 768e807b40..eefb3ba2e8 100644
107--- a/cmake/external/helper_functions.cmake
108+++ b/cmake/external/helper_functions.cmake
109@@ -159,7 +159,12 @@ macro(onnxruntime_fetchcontent_makeavailable)
110 endif()
111
112 if(EXISTS ${__cmake_srcdir}/CMakeLists.txt)
113+ set(CMAKE_SKIP_INSTALL_RULES TRUE)
114+ if (__cmake_arg_SYSTEM)
115+ add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} SYSTEM)
116+ else()
117 add_subdirectory(${__cmake_srcdir} ${${__cmake_contentNameLower}_BINARY_DIR} EXCLUDE_FROM_ALL)
118+ endif()
119 get_property(subdir_import_targets DIRECTORY "${__cmake_srcdir}" PROPERTY BUILDSYSTEM_TARGETS)
120 foreach(subdir_target ${subdir_import_targets})
121 if(TARGET ${subdir_target})
122@@ -176,6 +181,7 @@ macro(onnxruntime_fetchcontent_makeavailable)
123 set_target_properties(${subdir_target} PROPERTIES COMPILE_WARNING_AS_ERROR OFF)
124 endif()
125 endforeach()
126+ set(CMAKE_SKIP_INSTALL_RULES FALSE)
127 endif()
128
129 unset(__cmake_srcdir)
130--
1312.45.2
132