[nvidia-triton-*] update ports to use late 2024, early 2025 commit (#328

) * [nvidia-triton-core] checked protobuf error message * [nvidia-triton-common] use latest sources * [nvidia-triton-client] use latest sources * [nvidia-triton-core] use latest sources, patches * [nvidia-triton-core] add ABSL_CONSUME_DLL macro * [nvidia-triton-*] update baseline * [nvidia-triton-client] update checksum * [nvidia-triton-client] recreate patches
luncliff · Feb 26, 2025 · 930b076 · 930b076
1 parent 912cb94
commit 930b076
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 43 deletions.
diff --git a/ports/nvidia-triton-client/fix-cmake.patch b/ports/nvidia-triton-client/fix-cmake.patch
@@ -1,13 +1,11 @@
 diff --git a/src/c++/CMakeLists.txt b/src/c++/CMakeLists.txt
-index a542531..7fc7041 100644
+index 71c4338..e5e0ff4 100644
 --- a/src/c++/CMakeLists.txt
 +++ b/src/c++/CMakeLists.txt
-@@ -57,19 +57,7 @@ endif()
+@@ -58,17 +58,7 @@ endif()
  #
- # Dependencies
- #
--include(FetchContent)
--
+ include(FetchContent)
+
 -FetchContent_Declare(
 -  repo-common
 -  GIT_REPOSITORY ${TRITON_REPO_ORGANIZATION}/common.git
@@ -21,30 +19,30 @@ index a542531..7fc7041 100644
 -)
 +find_package(TritonCommon CONFIG REQUIRED)
 
- if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+ if(TRITON_ENABLE_CC_GRPC)
    set(TRITON_COMMON_ENABLE_PROTOBUF ON)
-@@ -93,7 +81,6 @@ endif()
- if(TRITON_ENABLE_TESTS OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -82,7 +72,6 @@ endif()
+ if(TRITON_ENABLE_TESTS)
    FetchContent_MakeAvailable(googletest)
  endif()
 -FetchContent_MakeAvailable(repo-common)
 
  if(TRITON_ENABLE_TESTS)
    include_directories(
 diff --git a/src/c++/library/CMakeLists.txt b/src/c++/library/CMakeLists.txt
-index cdee03e..6033ec9 100644
+index d44cd57..6d2e641 100644
 --- a/src/c++/library/CMakeLists.txt
 +++ b/src/c++/library/CMakeLists.txt
 @@ -48,7 +48,7 @@ target_include_directories(
- if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER OR TRITON_ENABLE_EXAMPLES)
+ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_EXAMPLES)
    find_package(RapidJSON CONFIG REQUIRED)
    add_library(
 -      json-utils-library EXCLUDE_FROM_ALL OBJECT
 +      json-utils-library OBJECT
        json_utils.h json_utils.cc
    )
    target_include_directories(
-@@ -93,20 +93,14 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -196,20 +196,14 @@ if(TRITON_ENABLE_CC_GRPC)
    )
 
    add_library(
@@ -66,7 +64,7 @@ index cdee03e..6033ec9 100644
    )
    add_library(
        TritonClient::grpcclient_static ALIAS grpcclient_static
-@@ -122,6 +116,8 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -225,6 +219,8 @@ if(TRITON_ENABLE_CC_GRPC)
        grpcclient_static
        PRIVATE gRPC::grpc++
        PRIVATE gRPC::grpc
@@ -75,7 +73,7 @@ index cdee03e..6033ec9 100644
        PUBLIC protobuf::libprotobuf
        PUBLIC Threads::Threads
    )
-@@ -129,8 +125,6 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -232,8 +228,6 @@ if(TRITON_ENABLE_CC_GRPC)
    # libgrpcclient.so
    add_library(
        grpcclient SHARED
@@ -84,7 +82,7 @@ index cdee03e..6033ec9 100644
        $<TARGET_OBJECTS:grpc-client-library>
    )
    add_library(
-@@ -150,6 +144,8 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -253,6 +247,8 @@ if(TRITON_ENABLE_CC_GRPC)
        grpcclient
        PRIVATE gRPC::grpc++
        PRIVATE gRPC::grpc
@@ -93,7 +91,7 @@ index cdee03e..6033ec9 100644
        PUBLIC protobuf::libprotobuf
        PUBLIC Threads::Threads
    )
-@@ -169,13 +165,13 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -272,13 +268,13 @@ if(TRITON_ENABLE_CC_GRPC)
          POSITION_INDEPENDENT_CODE ON
      )
 
@@ -109,7 +107,7 @@ index cdee03e..6033ec9 100644
        PRIVATE
          ${CMAKE_CURRENT_SOURCE_DIR}
      )
-@@ -234,20 +230,12 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -335,20 +331,12 @@ if(TRITON_ENABLE_CC_GRPC)
        )
      endif() # NOT WIN32
 
@@ -129,27 +127,27 @@ index cdee03e..6033ec9 100644
 -      DESTINATION include
 +      DESTINATION include/triton
    )
- endif() # TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
+ endif() # TRITON_ENABLE_CC_GRPC
 
-@@ -272,7 +260,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -373,7 +361,7 @@ if(TRITON_ENABLE_CC_HTTP)
    )
 
    add_library(
 -      http-client-library EXCLUDE_FROM_ALL OBJECT
-+      http-client-library STATIC
++      http-client-library OBJECT
        ${REQUEST_SRCS} ${REQUEST_HDRS}
    )
 
-@@ -286,7 +274,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -387,7 +375,7 @@ if(TRITON_ENABLE_CC_HTTP)
    target_link_libraries(
      http-client-library
      PUBLIC
 -      triton-common-json        # from repo-common
-+      TritonCommon::triton-common-json # from repo-common
++      TritonCommon::triton-common-json
    )
 
    # libhttpclient_static.a
-@@ -300,7 +288,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -401,7 +389,7 @@ if(TRITON_ENABLE_CC_HTTP)
 
    target_link_libraries(
        httpclient_static
@@ -158,7 +156,7 @@ index cdee03e..6033ec9 100644
        PUBLIC CURL::libcurl
        PUBLIC Threads::Threads
    )
-@@ -332,7 +320,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -433,7 +421,7 @@ if(TRITON_ENABLE_CC_HTTP)
 
    target_link_libraries(
        httpclient
@@ -167,19 +165,19 @@ index cdee03e..6033ec9 100644
        PUBLIC CURL::libcurl
        PUBLIC Threads::Threads
    )
-@@ -391,7 +379,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER)
+@@ -490,7 +478,7 @@ if(TRITON_ENABLE_CC_HTTP)
    install(
        FILES
        ${CMAKE_CURRENT_SOURCE_DIR}/http_client.h
 -      DESTINATION include
 +      DESTINATION include/triton
    )
- endif() # TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_PERF_ANALYZER
+ endif() # TRITON_ENABLE_CC_HTTP
 
-@@ -400,7 +388,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
-       FILES
+@@ -500,7 +488,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC)
        ${CMAKE_CURRENT_SOURCE_DIR}/common.h
        ${CMAKE_CURRENT_SOURCE_DIR}/ipc.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/cencode.h
 -      DESTINATION include
 +      DESTINATION include/triton
    )

diff --git a/ports/nvidia-triton-client/portfile.cmake b/ports/nvidia-triton-client/portfile.cmake
@@ -1,9 +1,8 @@
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO triton-inference-server/client
-    REF 442915d806a9a6170f1ac138681a48200ec93899
-    SHA512 63a29643d1bf46244cfb670c36f53fdafda17fb2e2365b9e6bd78088b7d83e3c69c4a2d28ef25f0cc6c9d522140b290574e53b33b2b00ddbf7a9179bf370fc92
+    REF 3d9424956ba14660f9447575928601d449919abd
+    SHA512 53a19801bcabf579011ddd9f682cf49f2e2e472816d7ff6cb0790eb404c2b9b19ce9c22e71d0bda9f21f7211deab80b94d6401b6ddf62c1e7839fb88b01e4d88
     HEAD_REF main
     PATCHES
         fix-cmake.patch
@@ -24,7 +23,7 @@ vcpkg_cmake_configure(
         -DTRITON_ENABLE_EXAMPLES=OFF
         -DTRITON_ENABLE_TESTS=OFF
         -DTRITON_ENABLE_ZLIB=OFF
-        -DTRITON_ENABLE_PERF_ANALYZER=OFF
+        # -DTRITON_ENABLE_PERF_ANALYZER=OFF
 )
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/TritonClient PACKAGE_NAME TritonClient)

diff --git a/ports/nvidia-triton-client/vcpkg.json b/ports/nvidia-triton-client/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nvidia-triton-client",
-  "version-date": "2024-07-26",
+  "version-date": "2025-01-17",
   "description": "Triton Python, C++ and Java client libraries, and GRPC-generated client examples for go, java and scala.",
   "homepage": "https://github.com/triton-inference-server/client",
   "license": "BSD-3-Clause",

diff --git a/ports/nvidia-triton-common/portfile.cmake b/ports/nvidia-triton-common/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO triton-inference-server/common
-    REF e827f28a4815ec3a4caa859b333fa67b4ad848ac
-    SHA512 932139aa52ec03fcce2c2c16eaae034ffe7b8e5e06f142305ed97def7ee3307076286617e5a886a31e7d7553c0fe3eafd183b5e8dfd8f1a2a1c2aa6a0f913b66
+    REF a6b410343234f9acaa5d615c19f5b38690b45dff
+    SHA512 0e2a142ca1c5203c175439fa0080da81e0335f9df05bc38bcbf3b4f4c98a39d35546a5748a4864aff121406824b3e74ac593de4ec6eb1a0dbc241af32c996aa0
     HEAD_REF main
     PATCHES
         fix-cmake.patch

diff --git a/ports/nvidia-triton-common/vcpkg.json b/ports/nvidia-triton-common/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nvidia-triton-common",
-  "version-date": "2024-07-12",
+  "version-date": "2024-11-27",
   "description": "Common source, scripts and utilities shared across all Triton repositories.",
   "homepage": "https://github.com/triton-inference-server/common",
   "license": "BSD-3-Clause",

diff --git a/ports/nvidia-triton-core/fix-cmake.patch b/ports/nvidia-triton-core/fix-cmake.patch
@@ -82,3 +82,29 @@ index ba027a5..afe7c02 100644
  install(
    TARGETS
      triton-core
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 16aca67..bafd41a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -63,6 +63,8 @@ message(STATUS "Using Boost ${Boost_VERSION}")
+ set(protobuf_MODULE_COMPATIBLE TRUE CACHE BOOL "protobuf_MODULE_COMPATIBLE" FORCE)
+ find_package(Protobuf CONFIG REQUIRED)
+ message(STATUS "Using protobuf ${Protobuf_VERSION}")
++find_package(absl CONFIG REQUIRED)
++message(STATUS "Using absl ${absl_VERSION}")
+
+ #
+ # Prometheus
+@@ -458,6 +460,12 @@ target_link_libraries(
+     protobuf::libprotobuf
+     re2::re2
+ )
++if(TARGET absl::abseil_dll)
++  target_link_libraries(triton-core PRIVATE absl::abseil_dll)
++  target_compile_definitions(triton-core PRIVATE ABSL_CONSUME_DLL=1)
++elseif(TARGET absl::log_internal_nullguard)
++  target_link_libraries(triton-core PRIVATE absl::log_internal_nullguard)
++endif()
+
+ if (NOT WIN32)
+   target_link_libraries(
diff --git a/ports/nvidia-triton-core/fix-sources.patch b/ports/nvidia-triton-core/fix-sources.patch
@@ -0,0 +1,13 @@
+diff --git a/src/model_config_utils.cc b/src/model_config_utils.cc
+index a182fe3..d618249 100644
+--- a/src/model_config_utils.cc
++++ b/src/model_config_utils.cc
+@@ -2161,7 +2161,7 @@ ModelConfigToJson(
+   std::string config_json_str;
+   ::google::protobuf::util::JsonPrintOptions options;
+   options.preserve_proto_field_names = true;
+-  options.always_print_primitive_fields = true;
++  // options.always_print_primitive_fields = true; // deprecated and removed
+   ::google::protobuf::util::MessageToJsonString(
+       config, &config_json_str, options);
+
diff --git a/ports/nvidia-triton-core/portfile.cmake b/ports/nvidia-triton-core/portfile.cmake
@@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO triton-inference-server/core
-    REF a9048db96d270ec0adb75e27b00997f8e9e383cd
-    SHA512 44f428c937b827ea5e43be70b285d5d9a04fead354a1511e3cce3d6ce1fdc64fac67ee1cf15663378195a7d30c71d2d1307b3620e1c63a53c7bfb095707089d5
+    REF d53c1f7f8bceb891041e85f0bbf96837fd5cd0bf
+    SHA512 4cde77607512fa05f78830b4aa1cbc549d9fefef6088ec3f49b994f1ac0b12f6675e7d0d485ec1d8d768cccfd79e8382fdbeb3a1bd7cdbfcf924150043b97724
     HEAD_REF main
     PATCHES
         fix-cmake.patch
+        fix-sources.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -30,6 +31,8 @@ vcpkg_cmake_configure(
         -DTRITON_ENABLE_NVTX=ON
         -DTRITON_ENABLE_GPU=ON
         -DTRITON_MIN_COMPUTE_CAPABILITY:STRING="6.0"
+    OPTIONS_DEBUG
+        -DTRITON_ENABLE_TRACING=ON
     MAYBE_UNUSED_VARIABLES
         TRITON_CORE_HEADERS_ONLY
 )

diff --git a/ports/nvidia-triton-core/vcpkg.json b/ports/nvidia-triton-core/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "nvidia-triton-core",
-  "version-date": "2024-07-26",
+  "version-date": "2025-02-08",
   "description": "The core library and APIs implementing the Triton Inference Server.",
   "homepage": "https://github.com/triton-inference-server/core",
   "license": "BSD-3-Clause",
@@ -55,7 +55,7 @@
       ]
     },
     "google-cloud-storage": {
-      "description": "Include Azure Storage Filesystem support",
+      "description": "Include GCS Filesystem support",
       "dependencies": [
         {
           "name": "google-cloud-cpp",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -141,15 +141,15 @@
       "port-version": 0
     },
     "nvidia-triton-client": {
-      "baseline": "2024-07-26",
+      "baseline": "2025-01-17",
       "port-version": 0
     },
     "nvidia-triton-common": {
-      "baseline": "2024-07-12",
+      "baseline": "2024-11-27",
       "port-version": 0
     },
     "nvidia-triton-core": {
-      "baseline": "2024-07-26",
+      "baseline": "2025-02-08",
       "port-version": 0
     },
     "onnx": {

diff --git a/versions/n-/nvidia-triton-client.json b/versions/n-/nvidia-triton-client.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fb677e9aa546b27868b91a34a44a1d8d36398978",
+      "version-date": "2025-01-17",
+      "port-version": 0
+    },
     {
       "git-tree": "361b96b09d268104bcf87e6861eca87176aac74f",
       "version-date": "2024-07-26",

diff --git a/versions/n-/nvidia-triton-common.json b/versions/n-/nvidia-triton-common.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3a682cfccfa9d7fe095316a7a15875388bb6b3c3",
+      "version-date": "2024-11-27",
+      "port-version": 0
+    },
     {
       "git-tree": "63971390b0249a9a746b2119b88d6e6c6e9f43b2",
       "version-date": "2024-07-12",

diff --git a/versions/n-/nvidia-triton-core.json b/versions/n-/nvidia-triton-core.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e2a8d4ff4c149f2352ed76255bbb35b792080ac8",
+      "version-date": "2025-02-08",
+      "port-version": 0
+    },
     {
       "git-tree": "b758d8912240227752c53859ede4631c1d596f21",
       "version-date": "2024-07-26",