Skip to content

Commit

Permalink
Parameterize git repository (#6934)
Browse files Browse the repository at this point in the history
* patching git repository parameterization from production branch 1

* Fix go package directory name

* pre-commit fixes

* pre-commit fixes

---------

Co-authored-by: kyle <[email protected]>
  • Loading branch information
nv-kmcgill53 and kyle authored Mar 6, 2024
1 parent 46f87ff commit 2255663
Show file tree
Hide file tree
Showing 20 changed files with 73 additions and 24 deletions.
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ option(TRITON_ENABLE_TENSORRT "Include TensorRT backend in server" OFF)
option(TRITON_ENABLE_ASAN "Build with address sanitizer" OFF)

# Repo tags
set(TRITON_REPO_ORGANIZATION "https://github.com/triton-inference-server" CACHE STRING "Git repository to pull from")
set(TRITON_THIRD_PARTY_REPO_TAG "main" CACHE STRING
"Tag for triton-inference-server/third_party repo")
set(TRITON_COMMON_REPO_TAG "main" CACHE STRING "Tag for triton-inference-server/common repo")
Expand Down Expand Up @@ -113,12 +114,12 @@ include(FetchContent)

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}
)
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}
)

Expand Down Expand Up @@ -237,6 +238,7 @@ ExternalProject_Add(triton-server
-Daws-c-common_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/aws-sdk-cpp/${LIB_DIR}/aws-c-common/cmake
-Daws-checksums_DIR:PATH=${TRITON_THIRD_PARTY_INSTALL_PREFIX}/aws-sdk-cpp/${LIB_DIR}/aws-checksums/cmake
-Dopentelemetry-cpp_DIR:PATH=${_FINDPACKAGE_OPENTELEMETRY_CONFIG_DIR}
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION}
-DTRITON_IGPU_BUILD:BOOL=${TRITON_IGPU_BUILD}
-DTRITON_THIRD_PARTY_REPO_TAG:STRING=${TRITON_THIRD_PARTY_REPO_TAG}
-DTRITON_COMMON_REPO_TAG:STRING=${TRITON_COMMON_REPO_TAG}
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.QA
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
ARG BASE_IMAGE=tritonserver
ARG CIBASE_IMAGE=tritonserver_cibase
ARG SDK_IMAGE=tritonserver_sdk
ARG TRITON_REPO_ORGANIZATION=http://github.com/triton-inference-server
ARG TRITON_COMMON_REPO_TAG=main
ARG TRITON_CORE_REPO_TAG=main
ARG TRITON_THIRD_PARTY_REPO_TAG=main
Expand All @@ -41,6 +42,7 @@ ARG IGPU_BUILD=0
FROM ${CIBASE_IMAGE} AS cibase

ARG TRITONTMP_DIR
ARG TRITON_REPO_ORGANIZATION
ARG TRITON_COMMON_REPO_TAG
ARG TRITON_CORE_REPO_TAG
ARG TRITON_THIRD_PARTY_REPO_TAG
Expand Down Expand Up @@ -183,6 +185,7 @@ RUN cd tritonbuild/identity && \
rm -rf install build && mkdir build && cd build && \
cmake -DTRITON_ENABLE_GPU=OFF \
-DCMAKE_INSTALL_PREFIX:PATH=/workspace/tritonbuild/identity/install \
-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_THIRD_PARTY_REPO_TAG:STRING=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand All @@ -193,6 +196,7 @@ RUN cd tritonbuild/identity && \
RUN cd tritonbuild/python && \
rm -rf install build && mkdir build && cd build && \
cmake -DCMAKE_INSTALL_PREFIX:PATH=/workspace/tritonbuild/python/install \
-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_BACKEND_REPO_TAG:STRING=${TRITON_BACKEND_REPO_TAG} .. && \
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile.sdk
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ RUN rm -f /usr/bin/python && \
ln -s /usr/bin/python3 /usr/bin/python

# Build the client library and examples
ARG TRITON_REPO_ORGANIZATION
ARG TRITON_CLIENT_REPO_SUBDIR
ARG TRITON_COMMON_REPO_TAG
ARG TRITON_CORE_REPO_TAG
Expand All @@ -117,6 +118,7 @@ COPY ${TRITON_CLIENT_REPO_SUBDIR} client
WORKDIR /workspace/build
RUN cmake -DCMAKE_INSTALL_PREFIX=/workspace/install \
-DTRITON_VERSION=`cat /workspace/TRITON_VERSION` \
-DTRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -150,6 +152,7 @@ FROM ${BASE_IMAGE}
ENV DEBIAN_FRONTEND=noninteractive

ARG DCGM_VERSION
ARG TRITON_REPO_ORGANIZATION
ARG TRITON_CORE_REPO_TAG
ARG TARGETPLATFORM
ARG TRITON_ENABLE_GPU
Expand Down Expand Up @@ -222,7 +225,7 @@ RUN rm -f /usr/bin/python && \

# Install Model Analyzer
ARG TRITON_MODEL_ANALYZER_REPO_TAG
ARG TRITON_MODEL_ANALYZER_REPO="https://github.com/triton-inference-server/model_analyzer@${TRITON_MODEL_ANALYZER_REPO_TAG}"
ARG TRITON_MODEL_ANALYZER_REPO="${TRITON_REPO_ORGANIZATION}/model_analyzer@${TRITON_MODEL_ANALYZER_REPO_TAG}"
RUN pip3 install "git+${TRITON_MODEL_ANALYZER_REPO}"

# Entrypoint Banner
Expand Down
10 changes: 10 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ def core_cmake_args(components, backends, cmake_dir, install_dir):
cmake_core_arg("CMAKE_BUILD_TYPE", None, FLAGS.build_type),
cmake_core_arg("CMAKE_INSTALL_PREFIX", "PATH", install_dir),
cmake_core_arg("TRITON_VERSION", "STRING", FLAGS.version),
cmake_core_arg("TRITON_REPO_ORGANIZATION", "STRING", FLAGS.github_organization),
cmake_core_arg("TRITON_COMMON_REPO_TAG", "STRING", components["common"]),
cmake_core_arg("TRITON_CORE_REPO_TAG", "STRING", components["core"]),
cmake_core_arg("TRITON_BACKEND_REPO_TAG", "STRING", components["backend"]),
Expand Down Expand Up @@ -503,6 +504,9 @@ def repoagent_cmake_args(images, components, ra, install_dir):
cargs = args + [
cmake_repoagent_arg("CMAKE_BUILD_TYPE", None, FLAGS.build_type),
cmake_repoagent_arg("CMAKE_INSTALL_PREFIX", "PATH", install_dir),
cmake_repoagent_arg(
"TRITON_REPO_ORGANIZATION", "STRING", FLAGS.github_organization
),
cmake_repoagent_arg("TRITON_COMMON_REPO_TAG", "STRING", components["common"]),
cmake_repoagent_arg("TRITON_CORE_REPO_TAG", "STRING", components["core"]),
]
Expand All @@ -524,6 +528,9 @@ def cache_cmake_args(images, components, cache, install_dir):
cargs = args + [
cmake_cache_arg("CMAKE_BUILD_TYPE", None, FLAGS.build_type),
cmake_cache_arg("CMAKE_INSTALL_PREFIX", "PATH", install_dir),
cmake_cache_arg(
"TRITON_REPO_ORGANIZATION", "STRING", FLAGS.github_organization
),
cmake_cache_arg("TRITON_COMMON_REPO_TAG", "STRING", components["common"]),
cmake_cache_arg("TRITON_CORE_REPO_TAG", "STRING", components["core"]),
]
Expand Down Expand Up @@ -571,6 +578,9 @@ def backend_cmake_args(images, components, be, install_dir, library_paths):
cargs = args + [
cmake_backend_arg(be, "CMAKE_BUILD_TYPE", None, cmake_build_type),
cmake_backend_arg(be, "CMAKE_INSTALL_PREFIX", "PATH", install_dir),
cmake_backend_arg(
be, "TRITON_REPO_ORGANIZATION", "STRING", FLAGS.github_organization
),
cmake_backend_arg(be, "TRITON_COMMON_REPO_TAG", "STRING", components["common"]),
cmake_backend_arg(be, "TRITON_CORE_REPO_TAG", "STRING", components["core"]),
cmake_backend_arg(
Expand Down
4 changes: 3 additions & 1 deletion qa/L0_backend_bls/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

export CUDA_VISIBLE_DEVICES=0

TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}
TRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG:="main"}
TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG:="main"}
TRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG:="main"}
Expand All @@ -51,12 +52,13 @@ cmake --version
rm -fr *.log ./backend

git clone --single-branch --depth=1 -b $TRITON_BACKEND_REPO_TAG \
https://github.com/triton-inference-server/backend.git
${TRITON_REPO_ORGANIZATION}/backend.git

(cd backend/examples/backends/bls &&
mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
Expand Down
4 changes: 3 additions & 1 deletion qa/L0_backend_python/bls/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ CLIENT_LOG="./bls_client.log"
TEST_RESULT_FILE='test_results.txt'
source ../../common/util.sh

TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:=http://github.com/triton-inference-server}

RET=0
rm -fr *.log ./models *.txt

Expand Down Expand Up @@ -76,7 +78,7 @@ if [[ ${TEST_WINDOWS} == 0 ]]; then

cp -r ${DATADIR}/qa_sequence_implicit_model_repository/onnx_nobatch_sequence_int32/ ./models

git clone https://github.com/triton-inference-server/python_backend -b $PYTHON_BACKEND_REPO_TAG
git clone ${TRITON_REPO_ORGANIZATION}/python_backend -b $PYTHON_BACKEND_REPO_TAG
mkdir -p models/square_int32/1/
cp python_backend/examples/decoupled/square_model.py models/square_int32/1/model.py
cp python_backend/examples/decoupled/square_config.pbtxt models/square_int32/config.pbtxt
Expand Down
4 changes: 2 additions & 2 deletions qa/L0_backend_python/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ create_conda_env_with_specified_path() {

create_python_backend_stub() {
rm -rf python_backend
git clone https://github.com/triton-inference-server/python_backend -b $PYTHON_BACKEND_REPO_TAG
git clone ${TRITON_REPO_ORGANIZATION}/python_backend -b $PYTHON_BACKEND_REPO_TAG
(cd python_backend/ && mkdir builddir && cd builddir && \
cmake -DTRITON_ENABLE_GPU=ON -DTRITON_BACKEND_REPO_TAG=$TRITON_BACKEND_REPO_TAG -DTRITON_COMMON_REPO_TAG=$TRITON_COMMON_REPO_TAG -DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG ../ && \
cmake -DTRITON_ENABLE_GPU=ON -DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} -DTRITON_BACKEND_REPO_TAG=$TRITON_BACKEND_REPO_TAG -DTRITON_COMMON_REPO_TAG=$TRITON_COMMON_REPO_TAG -DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG ../ && \
make -j18 triton-python-backend-stub)
}
3 changes: 2 additions & 1 deletion qa/L0_backend_python/decoupled/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}
CLIENT_PY=./decoupled_test.py
CLIENT_LOG="./decoupled_client.log"
TEST_RESULT_FILE='test_results.txt'
Expand Down Expand Up @@ -53,7 +54,7 @@ cp ../../python_models/execute_cancel/config.pbtxt ./models/execute_cancel/
echo "model_transaction_policy { decoupled: True }" >> ./models/execute_cancel/config.pbtxt

rm -fr python_backend
git clone https://github.com/triton-inference-server/python_backend -b $PYTHON_BACKEND_REPO_TAG
git clone ${TRITON_REPO_ORGANIZATION}/python_backend -b $PYTHON_BACKEND_REPO_TAG
mkdir -p models/square_int32/1/
cp python_backend/examples/decoupled/square_model.py models/square_int32/1/model.py
cp python_backend/examples/decoupled/square_config.pbtxt models/square_int32/config.pbtxt
Expand Down
4 changes: 3 additions & 1 deletion qa/L0_backend_python/examples/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
source ../common.sh
source ../../common/util.sh

TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}

SERVER_ARGS="--model-repository=${MODELDIR}/examples/python_backend/models --backend-directory=${BACKEND_DIR} --log-verbose=1"
SERVER_LOG="./examples_server.log"

Expand All @@ -50,7 +52,7 @@ if [ "$TEST_JETSON" == "0" ]; then
pip3 install --upgrade "jax[cuda12_local]" -f https://storage.googleapis.com/jax-releases/jax_cuda_releases.html
fi

git clone https://github.com/triton-inference-server/python_backend -b $PYTHON_BACKEND_REPO_TAG
git clone ${TRITON_REPO_ORGANIZATION}/python_backend -b $PYTHON_BACKEND_REPO_TAG
cd python_backend

# Example 1
Expand Down
2 changes: 2 additions & 0 deletions qa/L0_backend_python/setup_python_enviroment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ fi
source common.sh
source ../common/util.sh

TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}
BASE_SERVER_ARGS="--model-repository=${MODELDIR}/models --log-verbose=1 --disable-auto-complete-config"
PYTHON_BACKEND_BRANCH=$PYTHON_BACKEND_REPO_TAG
SERVER_ARGS=$BASE_SERVER_ARGS
Expand Down Expand Up @@ -160,6 +161,7 @@ find /opt/tritonserver/qa/pkgs/ -maxdepth 1 -type f -name \
# Build triton-shm-monitor for the test
cd python_backend && rm -rf install build && mkdir build && cd build && \
cmake -DCMAKE_INSTALL_PREFIX:PATH=$PWD/install \
-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_BACKEND_REPO_TAG:STRING=${TRITON_BACKEND_REPO_TAG} .. && \
Expand Down
5 changes: 3 additions & 2 deletions qa/L0_backend_python/variants/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# Building a CPU build of Python backend
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:=http://github.com/triton-inference-server}

source ../common.sh
install_build_deps
rm -rf python_backend

git clone https://github.com/triton-inference-server/python_backend -b $PYTHON_BACKEND_REPO_TAG
git clone ${TRITON_REPO_ORGANIZATION}/python_backend -b $PYTHON_BACKEND_REPO_TAG
(cd python_backend/ && mkdir builddir && cd builddir && \
cmake -DTRITON_ENABLE_GPU=OFF -DTRITON_BACKEND_REPO_TAG=$TRITON_BACKEND_REPO_TAG -DTRITON_COMMON_REPO_TAG=$TRITON_COMMON_REPO_TAG -DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG ../ && \
cmake -DTRITON_ENABLE_GPU=OFF -DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} -DTRITON_BACKEND_REPO_TAG=$TRITON_BACKEND_REPO_TAG -DTRITON_COMMON_REPO_TAG=$TRITON_COMMON_REPO_TAG -DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG ../ && \
make -j18 install)

if [ $? == 0 ]; then
Expand Down
5 changes: 4 additions & 1 deletion qa/L0_backend_tutorial/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

export CUDA_VISIBLE_DEVICES=0

TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}
TRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG:="main"}
TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG:="main"}
TRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG:="main"}
Expand All @@ -53,7 +54,7 @@ cmake --version

rm -fr *.log ./backend
git clone --single-branch --depth=1 -b $TRITON_BACKEND_REPO_TAG \
https://github.com/triton-inference-server/backend.git
${TRITON_REPO_ORGANIZATION}/backend.git

#
# Minimal backend
Expand All @@ -62,6 +63,7 @@ git clone --single-branch --depth=1 -b $TRITON_BACKEND_REPO_TAG \
mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
Expand Down Expand Up @@ -139,6 +141,7 @@ rm -fr /opt/tritonserver/backends/minimal
mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
Expand Down
10 changes: 7 additions & 3 deletions qa/L0_batch_custom/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ SERVER=/opt/tritonserver/bin/tritonserver
SERVER_ARGS="--model-repository=models --log-verbose 1"
SERVER_LOG_BASE="./inference_server.log"
TEST_RESULT_FILE='test_results.txt'
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}
TRITON_BACKEND_REPO_TAG=${TRITON_BACKEND_REPO_TAG:="main"}
TRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG:="main"}

Expand Down Expand Up @@ -80,19 +81,21 @@ echo "parameters { key: \"MAX_BATCH_VOLUME_BYTES\" value: {string_value: \"96\"}

# Create custom batching libraries
git clone --single-branch --depth=1 -b $TRITON_BACKEND_REPO_TAG \
https://github.com/triton-inference-server/backend.git
${TRITON_REPO_ORGANIZATION}/backend.git

(cd backend/examples/batching_strategies/volume_batching &&
mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install \
-DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG .. &&
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG .. &&
make -j4 install)

(cd backend/examples/batching_strategies/single_batching &&
mkdir build &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG .. &&
make -j4 install)

Expand Down Expand Up @@ -161,7 +164,8 @@ sed -i "s/${OLD_STRING}/${NEW_STRING}/g" ${FILE_PATH}
(cd backend/examples/batching_strategies/volume_batching &&
cd build &&
cmake -DCMAKE_INSTALL_PREFIX:PATH=`pwd`/install \
-DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG .. &&
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_CORE_REPO_TAG=$TRITON_CORE_REPO_TAG .. &&
make -j4 install)

cp -r backend/examples/batching_strategies/volume_batching/build/libtriton_volumebatching.so models/${MODEL_NAME}/libtriton_volumebatching.so
Expand Down
8 changes: 8 additions & 0 deletions qa/L0_client_build_variants/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ mkdir -p /workspace/build
#
# Build without GPU support
#
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="http://github.com/triton-inference-server"}
(cd /workspace/build && \
rm -fr cc-clients java-clients python-clients && \
cmake -DCMAKE_INSTALL_PREFIX=/workspace/install \
Expand All @@ -64,6 +65,7 @@ mkdir -p /workspace/build
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=OFF \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -95,6 +97,7 @@ fi
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=ON \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -125,6 +128,7 @@ fi
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=ON \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -154,6 +158,7 @@ fi
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=ON \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -183,6 +188,7 @@ fi
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=ON \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -212,6 +218,7 @@ fi
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=ON \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down Expand Up @@ -241,6 +248,7 @@ fi
-DTRITON_ENABLE_EXAMPLES=ON \
-DTRITON_ENABLE_TESTS=ON \
-DTRITON_ENABLE_GPU=ON \
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
-DTRITON_THIRD_PARTY_REPO_TAG=${TRITON_THIRD_PARTY_REPO_TAG} \
Expand Down
Loading

0 comments on commit 2255663

Please sign in to comment.