Skip to content

Commit 8c6657e

Browse files
authored
test: Update server repo for some tests (#7704)
1 parent d99a877 commit 8c6657e

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

Dockerfile.sdk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ ARG NVIDIA_BUILD_ID
276276
ENV NVIDIA_TRITON_SERVER_SDK_VERSION=${NVIDIA_TRITON_SERVER_SDK_VERSION}
277277
ENV NVIDIA_BUILD_ID=${NVIDIA_BUILD_ID}
278278

279-
ENV PATH /workspace/install/bin:${PATH}
280-
ENV LD_LIBRARY_PATH /workspace/install/lib:${LD_LIBRARY_PATH}
279+
ENV PATH=/workspace/install/bin:${PATH}
280+
ENV LD_LIBRARY_PATH=/workspace/install/lib:${LD_LIBRARY_PATH}
281281

282282
# DLIS-3631: Needed to run Perf Analyzer CI tests correctly
283-
ENV LD_LIBRARY_PATH /opt/hpcx/ompi/lib:${LD_LIBRARY_PATH}
283+
ENV LD_LIBRARY_PATH=/opt/hpcx/ompi/lib:${LD_LIBRARY_PATH}
284284

285285
# Set TCMALLOC_RELEASE_RATE for users setting LD_PRELOAD with tcmalloc
286-
ENV TCMALLOC_RELEASE_RATE 200
286+
ENV TCMALLOC_RELEASE_RATE=200

qa/L0_java_memory_growth/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -27,10 +27,11 @@
2727

2828
# Set up test files based on installation instructions
2929
# https://github.com/bytedeco/javacpp-presets/blob/master/tritonserver/README.md
30+
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="https://github.com/triton-inference-server"}
3031
JAVACPP_BRANCH=${JAVACPP_BRANCH:="https://github.com/bytedeco/javacpp-presets.git"}
3132
JAVACPP_BRANCH_TAG=${JAVACPP_BRANCH_TAG:="master"}
3233
set -e
33-
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} https://github.com/triton-inference-server/client.git
34+
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} ${TRITON_REPO_ORGANIZATION}/client.git
3435
source client/src/java-api-bindings/scripts/install_dependencies_and_build.sh -b $PWD --javacpp-branch ${JAVACPP_BRANCH} --javacpp-tag ${JAVACPP_BRANCH_TAG} --keep-build-dependencies
3536
cd ..
3637

qa/L0_java_resnet/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -41,6 +41,7 @@ fi
4141
# Models
4242
DATADIR=/data/inferenceserver/${REPO_VERSION}
4343
MODEL_REPO=`pwd`/models
44+
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="https://github.com/triton-inference-server"}
4445
JAVACPP_BRANCH=${JAVACPP_BRANCH:="https://github.com/bytedeco/javacpp-presets.git"}
4546
JAVACPP_BRANCH_TAG=${JAVACPP_BRANCH_TAG:="master"}
4647

@@ -56,7 +57,7 @@ done
5657
# Set up test files based on installation instructions
5758
# https://github.com/bytedeco/javacpp-presets/blob/master/tritonserver/README.md
5859
set -e
59-
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} https://github.com/triton-inference-server/client.git
60+
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} ${TRITON_REPO_ORGANIZATION}/client.git
6061
source client/src/java-api-bindings/scripts/install_dependencies_and_build.sh -b $PWD --javacpp-branch ${JAVACPP_BRANCH} --javacpp-tag ${JAVACPP_BRANCH_TAG} --keep-build-dependencies
6162
cd ..
6263

qa/L0_java_sequence_batcher/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -40,13 +40,14 @@ fi
4040

4141
# Models
4242
DATADIR=/data/inferenceserver/${REPO_VERSION}
43+
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="https://github.com/triton-inference-server"}
4344
JAVACPP_BRANCH=${JAVACPP_BRANCH:="https://github.com/bytedeco/javacpp-presets.git"}
4445
JAVACPP_BRANCH_TAG=${JAVACPP_BRANCH_TAG:="master"}
4546

4647
# Set up test files based on installation instructions
4748
# https://github.com/bytedeco/javacpp-presets/blob/master/tritonserver/README.md
4849
set -e
49-
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} https://github.com/triton-inference-server/client.git
50+
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} ${TRITON_REPO_ORGANIZATION}/client.git
5051
source client/src/java-api-bindings/scripts/install_dependencies_and_build.sh -b $PWD --javacpp-branch ${JAVACPP_BRANCH} --javacpp-tag ${JAVACPP_BRANCH_TAG} --keep-build-dependencies
5152
cd ..
5253

qa/L0_java_simple_example/test.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -37,10 +37,11 @@ if [ -z "$REPO_VERSION" ]; then
3737
exit 1
3838
fi
3939

40+
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="https://github.com/triton-inference-server"}
4041
JAVACPP_BRANCH=${JAVACPP_BRANCH:="https://github.com/bytedeco/javacpp-presets.git"}
4142
JAVACPP_BRANCH_TAG=${JAVACPP_BRANCH_TAG:="master"}
4243
set -e
43-
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} https://github.com/triton-inference-server/client.git
44+
git clone --single-branch --depth=1 -b ${TRITON_CLIENT_REPO_TAG} ${TRITON_REPO_ORGANIZATION}/client.git
4445
source client/src/java-api-bindings/scripts/install_dependencies_and_build.sh -b $PWD --javacpp-branch ${JAVACPP_BRANCH} --javacpp-tag ${JAVACPP_BRANCH_TAG} --keep-build-dependencies
4546
cd ..
4647

qa/L0_pytorch_python_runtime/test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ fi
4040

4141
export CUDA_VISIBLE_DEVICES=0
4242

43+
TRITON_REPO_ORGANIZATION=${TRITON_REPO_ORGANIZATION:="https://github.com/triton-inference-server"}
4344
DATA_DIR=/data/inferenceserver/${REPO_VERSION}
4445
IMAGE_DIR="/opt/tritonserver/qa/images"
4546
SERVER=/opt/tritonserver/bin/tritonserver
@@ -50,7 +51,7 @@ source ../common/util.sh
5051
if [ ! -f "$BACKENDS/pytorch/pb_exec_env_model.py.tar.gz" ]; then
5152
PYTORCH_BACKEND_REPO_TAG=${PYTORCH_BACKEND_REPO_TAG:="main"}
5253
rm -rf pytorch_backend
53-
git clone --single-branch --depth=1 -b $PYTORCH_BACKEND_REPO_TAG https://github.com/triton-inference-server/pytorch_backend
54+
git clone --single-branch --depth=1 -b $PYTORCH_BACKEND_REPO_TAG ${TRITON_REPO_ORGANIZATION}/pytorch_backend
5455
(cd pytorch_backend/tools && \
5556
./gen_pb_exec_env.sh && \
5657
mv pb_exec_env_model.py.tar.gz $BACKENDS/pytorch)

0 commit comments

Comments
 (0)