From 9bede45ea89476c4f64b539096bb7b5147495c96 Mon Sep 17 00:00:00 2001 From: kyle Date: Thu, 29 Feb 2024 12:31:09 -0800 Subject: [PATCH] patching git repository parameterization from production branch 1 --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c43e3af11..37631ff09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,6 +182,7 @@ if(NOT TRITON_CORE_HEADERS_ONLY) option(TRITON_ENABLE_AZURE_STORAGE "Include Azure Storage Filesystem support in server" OFF) # Repo tags + 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") @@ -212,7 +213,7 @@ if(NOT TRITON_CORE_HEADERS_ONLY) 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} ) FetchContent_MakeAvailable(repo-third-party) @@ -325,6 +326,7 @@ if(NOT TRITON_CORE_HEADERS_ONLY) -Daws-checksums_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/aws-sdk-cpp/${LIB_DIR}/aws-checksums/cmake -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH} -DCNMEM_PATH:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/cnmem + -DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} -DTRITON_COMMON_REPO_TAG:STRING=${TRITON_COMMON_REPO_TAG} -DTRITON_EXTRA_LIB_PATHS:PATH=${TRITON_EXTRA_LIB_PATHS} -DTRITON_ENABLE_NVTX:BOOL=${TRITON_ENABLE_NVTX} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4a3d69251..ba027a534 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,7 +42,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} )