Merge on top of feature branch

triton-inference-server · Mar 11, 2024 · 4568f8b · 4568f8b
2 parents 5523b64 + b49f48c
commit 4568f8b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,6 +51,7 @@ option(TRITON_ENABLE_TESTS "Include tests in build" OFF)
 option(TRITON_ENABLE_GPU "Enable GPU support in libraries" OFF)
 option(TRITON_ENABLE_ZLIB "Include ZLIB library in build" ON)
 
+set(TRITON_REPO_ORGANIZATION "https://github.com/triton-inference-server" CACHE STRING "Git repository to pull from")
 set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo")
 set(TRITON_THIRD_PARTY_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/third_party repo")
 set(TRITON_CORE_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/core repo")
@@ -70,7 +71,7 @@ include(FetchContent)
 
 FetchContent_Declare(
   repo-third-party
-  GIT_REPOSITORY https://github.com/triton-inference-server/third_party.git
+  GIT_REPOSITORY ${TRITON_REPO_ORGANIZATION}/third_party.git
   GIT_TAG ${TRITON_THIRD_PARTY_REPO_TAG}
   GIT_SHALLOW ON
 )
@@ -162,6 +163,7 @@ if(TRITON_ENABLE_CC_HTTP OR TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER
       -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_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION}
       -DTRITON_COMMON_REPO_TAG:STRING=${TRITON_COMMON_REPO_TAG}
       -DTRITON_CORE_REPO_TAG:STRING=${TRITON_CORE_REPO_TAG}
       -DPERF_ANALYZER_VERSION:STRING=${PERF_ANALYZER_VERSION}
@@ -205,6 +207,7 @@ if(TRITON_ENABLE_PYTHON_HTTP OR TRITON_ENABLE_PYTHON_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_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION}
       -DTRITON_COMMON_REPO_TAG:STRING=${TRITON_COMMON_REPO_TAG}
       -DTRITON_CORE_REPO_TAG:STRING=${TRITON_CORE_REPO_TAG}
       -DTRITON_VERSION:STRING=${TRITON_VERSION}
@@ -233,6 +236,7 @@ if(TRITON_ENABLE_JAVA_HTTP)
       ${_CMAKE_ARGS_OPENSSL_ROOT_DIR}
       ${_CMAKE_ARGS_CMAKE_TOOLCHAIN_FILE}
       ${_CMAKE_ARGS_VCPKG_TARGET_TRIPLET}
+      -DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION}
       -DTRITON_VERSION:STRING=${TRITON_VERSION}
       -DTRITON_ENABLE_JAVA_HTTP:BOOL=${TRITON_ENABLE_JAVA_HTTP}
       -DTRITON_ENABLE_EXAMPLES:BOOL=${TRITON_ENABLE_EXAMPLES}

diff --git a/src/c++/CMakeLists.txt b/src/c++/CMakeLists.txt
@@ -55,7 +55,7 @@ include(FetchContent)
 
 FetchContent_Declare(
   repo-common
-  GIT_REPOSITORY https://github.com/triton-inference-server/common.git
+  GIT_REPOSITORY ${TRITON_REPO_ORGANIZATION}/common.git
   GIT_TAG ${TRITON_COMMON_REPO_TAG}
   GIT_SHALLOW ON
 )
@@ -72,7 +72,7 @@ if(TRITON_ENABLE_CC_GRPC OR TRITON_ENABLE_PERF_ANALYZER)
   if(TRITON_ENABLE_PERF_ANALYZER)
     FetchContent_Declare(
       repo-core
-      GIT_REPOSITORY https://github.com/triton-inference-server/core.git
+      GIT_REPOSITORY ${TRITON_REPO_ORGANIZATION}/core.git
       GIT_TAG ${TRITON_CORE_REPO_TAG}
       GIT_SHALLOW ON
     )

diff --git a/src/c++/perf_analyzer/genai-perf/genai_perf/wrapper.py b/src/c++/perf_analyzer/genai-perf/genai_perf/wrapper.py
@@ -29,6 +29,7 @@
 
 import genai_perf.utils as utils
 from genai_perf.constants import LOGGER_NAME
+from genai_perf.llm_inputs.llm_inputs import OutputFormat
 
 logger = logging.getLogger(LOGGER_NAME)
 
@@ -39,7 +40,7 @@ def add_protocol_args(args):
         cmd = ""
         if args.service_kind == "triton":
             cmd += f"-i grpc "
-            if args.output_format == "trtllm":
+            if args.output_format == OutputFormat.TRTLLM:
                 cmd += f"--shape max_tokens:1 --shape text_input:1 "
         elif args.service_kind == "openai":
             cmd += f"-i http "

diff --git a/src/grpc_generated/go/go.mod b/src/grpc_generated/go/go.mod
@@ -3,7 +3,7 @@ module github.com/triton-inference-server/client/src/grpc_generated/go
 go 1.21
 
 require (
-	google.golang.org/grpc v1.51.0
+	google.golang.org/grpc v1.62.0
 	google.golang.org/protobuf v1.31.0 // indirect
 )
 

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -52,7 +52,7 @@ include(FetchContent)
 
 FetchContent_Declare(
   repo-common
-  GIT_REPOSITORY https://github.com/triton-inference-server/common.git
+  GIT_REPOSITORY ${TRITON_REPO_ORGANIZATION}/common.git
   GIT_TAG ${TRITON_COMMON_REPO_TAG}
   GIT_SHALLOW ON
 )