From f6c102fcd4d77e44b45fe4452c829b1d22ac1dd5 Mon Sep 17 00:00:00 2001
From: Iman Tabrizian <itabrizian@nvidia.com>
Date: Fri, 29 Dec 2023 11:29:17 -0500
Subject: [PATCH 1/3] Fix RE2 for client library builds

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa3187a60..4db8144b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ endif()
 
 if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER OR TRITON_ENABLE_PERF_ANALYZER_C_API)
 
-  set(_cc_client_depends "")
+  set(_cc_client_depends re2)
   if(${TRITON_ENABLE_CC_HTTP})
     set(_cc_client_depends ${_cc_client_depends} curl)
   endif() # TRITON_ENABLE_CC_HTTP
@@ -152,6 +152,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
       -DProtobuf_DIR:PATH=${_FINDPACKAGE_PROTOBUF_CONFIG_DIR}
       -DgRPC_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/grpc/lib/cmake/grpc
       -Dabsl_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/absl/${LIB_DIR}/cmake/absl
+      -Dre2_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/re2/${LIB_DIR}/cmake/re2
       -Dc-ares_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/c-ares/${LIB_DIR}/cmake/c-ares
       -DGTEST_ROOT:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/googletest
       -DTRITON_COMMON_REPO_TAG:STRING=${TRITON_COMMON_REPO_TAG}
@@ -174,7 +175,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
 endif() # TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
 
 if(TRITON_ENABLE_PYTHON_HTTP OR TRITON_ENABLE_PYTHON_GRPC)
-  set(_py_client_depends "")
+  set(_py_client_depends re2)
   if(${TRITON_ENABLE_PYTHON_GRPC})
     set(_py_client_depends ${_py_client_depends} grpc protobuf)
   endif() # TRITON_ENABLE_PYTHON_GRPC
@@ -194,6 +195,7 @@ if(TRITON_ENABLE_PYTHON_HTTP OR TRITON_ENABLE_PYTHON_GRPC)
       -DgRPC_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/grpc/lib/cmake/grpc
       -Dabsl_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/absl/${LIB_DIR}/cmake/absl
       -Dc-ares_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/c-ares/${LIB_DIR}/cmake/c-ares
+      -Dre2_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/re2/${LIB_DIR}/cmake/re2
       -DTRITON_COMMON_REPO_TAG:STRING=${TRITON_COMMON_REPO_TAG}
       -DTRITON_CORE_REPO_TAG:STRING=${TRITON_CORE_REPO_TAG}
       -DTRITON_VERSION:STRING=${TRITON_VERSION}

From 9b25109f537b00ffb33c2d3b69f28d57565d9842 Mon Sep 17 00:00:00 2001
From: Iman Tabrizian <itabrizian@nvidia.com>
Date: Fri, 29 Dec 2023 14:41:36 -0500
Subject: [PATCH 2/3] Fix library installation

---
 src/c++/library/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/c++/library/CMakeLists.txt b/src/c++/library/CMakeLists.txt
index 8898683d2..e15140523 100644
--- a/src/c++/library/CMakeLists.txt
+++ b/src/c++/library/CMakeLists.txt
@@ -203,6 +203,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/grpc/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/c-ares/lib/
+          ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/lib/
         DESTINATION ${CMAKE_INSTALL_LIBDIR}
         FILES_MATCHING
           PATTERN "*\.a"
@@ -219,6 +220,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/grpc/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/c-ares/lib/
+          ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/lib/
         DESTINATION ${CMAKE_INSTALL_LIBDIR}
         FILES_MATCHING
           PATTERN "*\.lib"
@@ -233,6 +235,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
     install(
       DIRECTORY
         ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/grpc/include/
+        ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/include/
         ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/include/
         DESTINATION include
     )

From 9c672daef722d7f3824ed2007b1a22ccda9548d5 Mon Sep 17 00:00:00 2001
From: Iman Tabrizian <itabrizian@nvidia.com>
Date: Fri, 29 Dec 2023 16:19:44 -0500
Subject: [PATCH 3/3] Add re2

---
 src/c++/library/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/c++/library/CMakeLists.txt b/src/c++/library/CMakeLists.txt
index e15140523..c3611870f 100644
--- a/src/c++/library/CMakeLists.txt
+++ b/src/c++/library/CMakeLists.txt
@@ -204,6 +204,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/c-ares/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/lib/
+          ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/re2/lib/
         DESTINATION ${CMAKE_INSTALL_LIBDIR}
         FILES_MATCHING
           PATTERN "*\.a"
@@ -221,6 +222,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/c-ares/lib/
           ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/lib/
+          ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/re2/lib/
         DESTINATION ${CMAKE_INSTALL_LIBDIR}
         FILES_MATCHING
           PATTERN "*\.lib"
@@ -237,6 +239,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
         ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/grpc/include/
         ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/absl/include/
         ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/protobuf/include/
+        ${CMAKE_CURRENT_BINARY_DIR}/../../third-party/re2/include/
         DESTINATION include
     )
   endif()