Skip to content

Commit baf942e

Browse files
authored
ci: Fix failing CI tests (#8415)
1 parent 104e51c commit baf942e

12 files changed

Lines changed: 45 additions & 123 deletions

File tree

qa/L0_client_build_variants/test.sh

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -138,87 +138,6 @@ else
138138
exit 1
139139
fi
140140

141-
# TODO: TPRD-342 These tests should be PA CI test
142-
# cases not Triton test cases
143-
rm -fr /workspace/build
144-
mkdir -p /workspace/build
145-
#
146-
# Build without C API in Perf Analyzer
147-
#
148-
(cd /workspace/build && \
149-
export CMAKE_POLICY_VERSION_MINIMUM=3.5 && \
150-
cmake -DCMAKE_INSTALL_PREFIX=/workspace/install \
151-
-DTRITON_ENABLE_CC_HTTP=ON \
152-
-DTRITON_ENABLE_CC_GRPC=ON \
153-
-DTRITON_ENABLE_PERF_ANALYZER_C_API=OFF \
154-
-DTRITON_ENABLE_PERF_ANALYZER_TFS=ON \
155-
-DTRITON_ENABLE_PERF_ANALYZER_TS=ON \
156-
-DTRITON_ENABLE_GPU=ON \
157-
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
158-
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
159-
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
160-
-DTRITON_CLIENT_REPO_TAG=${TRITON_CLIENT_REPO_TAG} \
161-
/workspace/perf_analyzer && \
162-
make -j16 perf-analyzer)
163-
if [ $? -eq 0 ]; then
164-
echo -e "\n***\n*** No-CAPI Passed\n***"
165-
else
166-
echo -e "\n***\n*** No-CAPI FAILED\n***"
167-
exit 1
168-
fi
169-
170-
#
171-
# Build without TensorFlow Serving in Perf Analyzer
172-
#
173-
(cd /workspace/build && \
174-
rm -fr cc_clients perf_analyzer && \
175-
export CMAKE_POLICY_VERSION_MINIMUM=3.5 && \
176-
cmake -DCMAKE_INSTALL_PREFIX=/workspace/install \
177-
-DTRITON_ENABLE_CC_HTTP=ON \
178-
-DTRITON_ENABLE_CC_GRPC=ON \
179-
-DTRITON_ENABLE_PERF_ANALYZER_C_API=ON \
180-
-DTRITON_ENABLE_PERF_ANALYZER_TFS=OFF \
181-
-DTRITON_ENABLE_PERF_ANALYZER_TS=ON \
182-
-DTRITON_ENABLE_GPU=ON \
183-
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
184-
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
185-
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
186-
-DTRITON_CLIENT_REPO_TAG=${TRITON_CLIENT_REPO_TAG} \
187-
/workspace/perf_analyzer && \
188-
make -j16 perf-analyzer)
189-
if [ $? -eq 0 ]; then
190-
echo -e "\n***\n*** No-TF-Serving Passed\n***"
191-
else
192-
echo -e "\n***\n*** No-TF-Serving FAILED\n***"
193-
exit 1
194-
fi
195-
196-
#
197-
# Build without TorchServe in Perf Analyzer
198-
#
199-
(cd /workspace/build && \
200-
rm -fr cc_clients perf_analyzer && \
201-
export CMAKE_POLICY_VERSION_MINIMUM=3.5 && \
202-
cmake -DCMAKE_INSTALL_PREFIX=/workspace/install \
203-
-DTRITON_ENABLE_CC_HTTP=ON \
204-
-DTRITON_ENABLE_CC_GRPC=ON \
205-
-DTRITON_ENABLE_PERF_ANALYZER_C_API=ON \
206-
-DTRITON_ENABLE_PERF_ANALYZER_TFS=ON \
207-
-DTRITON_ENABLE_PERF_ANALYZER_TS=OFF \
208-
-DTRITON_ENABLE_GPU=ON \
209-
-DTRITON_REPO_ORGANIZATION:STRING=${TRITON_REPO_ORGANIZATION} \
210-
-DTRITON_COMMON_REPO_TAG=${TRITON_COMMON_REPO_TAG} \
211-
-DTRITON_CORE_REPO_TAG=${TRITON_CORE_REPO_TAG} \
212-
-DTRITON_CLIENT_REPO_TAG=${TRITON_CLIENT_REPO_TAG} \
213-
/workspace/perf_analyzer && \
214-
make -j16 perf-analyzer)
215-
if [ $? -eq 0 ]; then
216-
echo -e "\n***\n*** No-TorchServe Passed\n***"
217-
else
218-
echo -e "\n***\n*** No-TorchServe FAILED\n***"
219-
exit 1
220-
fi
221-
222141
set -e
223142

224143
echo -e "\n***\n*** Test Passed\n***"

qa/L0_long_running_stress/scenarios.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def run(self, client_metadata):
9999

100100
class PerfAnalyzerScenario(Scenario):
101101
# Some class static variables
102-
command_ = "../clients/perf_analyzer"
102+
command_ = "perf_analyzer"
103103
generation_mutex_ = threading.Lock()
104104

105105
class ModelOption:

qa/L0_memory_growth/test.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# Copyright 2020-2025, 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
@@ -42,7 +42,8 @@ fi
4242
export CUDA_VISIBLE_DEVICES=0
4343

4444
# Clients
45-
PERF_ANALYZER=../clients/perf_analyzer
45+
pip3 install perf_analyzer
46+
PERF_ANALYZER=perf_analyzer
4647
IMAGE=../images/vulture.jpeg
4748

4849
# Models
@@ -101,7 +102,7 @@ export MAX_ALLOWED_ALLOC="100"
101102

102103
# Create local model repository
103104
mkdir -p models/
104-
cp -r $DATADIR/perf_model_store/resnet50* models/
105+
cp -r $DATADIR/perf_model_store/resnet50_* models/
105106

106107
# Create the TensorRT plan from ONNX model
107108
rm -fr models/resnet50_fp32_plan && mkdir -p models/resnet50_fp32_plan/1 && \

qa/L0_passive_instance/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) 2021, NVIDIA CORPORATION. All rights reserved.
2+
# Copyright (c) 2021-2025, NVIDIA CORPORATION. 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
@@ -45,7 +45,8 @@ CLIENT_LOG="./client.log"
4545
TEST_SCRIPT_PY=passive_instance_test.py
4646
EXPECTED_NUM_TESTS="1"
4747

48-
PERF_ANALYZER=../clients/perf_analyzer
48+
pip3 install perf_analyzer
49+
PERF_ANALYZER=perf_analyzer
4950
MODEL=distributed_int32_int32_int32
5051

5152
SERVER=/opt/tritonserver/bin/tritonserver

qa/L0_perf_deeprecommender/run_test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ STATIC_BATCH_SIZES=${STATIC_BATCH_SIZES:=1}
2929
DYNAMIC_BATCH_SIZES=${DYNAMIC_BATCH_SIZES:=1}
3030
INSTANCE_COUNTS=${INSTANCE_COUNTS:=1}
3131

32-
PERF_CLIENT=../clients/perf_client
32+
pip3 install perf_analyzer
33+
34+
PERF_CLIENT=perf_analyzer
3335
REPORTER=../common/reporter.py
3436

3537
SERVER=/opt/tritonserver/bin/tritonserver

qa/L0_perf_nomodel/run_test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ ARCH=${ARCH:="x86_64"}
4949
SERVER=${TRITON_DIR}/bin/tritonserver
5050
BACKEND_DIR=${TRITON_DIR}/backends
5151
MODEL_REPO="${PWD}/models"
52-
PERF_CLIENT=../clients/perf_client
52+
PERF_CLIENT=perf_analyzer
5353
SERVER_ARGS="--model-repository=${MODEL_REPO} --backend-directory=${BACKEND_DIR}"
5454
source ../common/util.sh
55+
pip3 install perf_analyzer
5556

5657
# DATADIR is already set in environment variable for aarch64
5758
if [ "$ARCH" != "aarch64" ]; then

qa/L0_perf_resnet/run_test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ rm -fr models && mkdir -p models && \
5353
sed -i "s/^max_batch_size:.*/max_batch_size: ${MAX_BATCH}/" config.pbtxt && \
5454
echo "instance_group [ { count: ${INSTANCE_CNT} }]")
5555

56+
pip3 install perf_analyzer
57+
5658
MEASUREMENT_WINDOW=5000
57-
PERF_CLIENT=../clients/perf_client
59+
PERF_CLIENT=perf_analyzer
5860
# Onnx and onnx-trt models are very slow on Jetson.
5961
if [ "$ARCH" == "aarch64" ]; then
6062
if [ "$MODEL_FRAMEWORK" == "onnx" ] || [ "$MODEL_FRAMEWORK" == "onnx_trt" ]; then

qa/L0_pinned_memory/test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ if [ ! -z "$TEST_REPO_ARCH" ]; then
3838
REPO_VERSION=${REPO_VERSION}_${TEST_REPO_ARCH}
3939
fi
4040

41+
pip3 install perf_analyzer
42+
4143
# Use "--request-count" throughout the test to PA stability criteria and
4244
# reduce flaky failures from PA unstable measurements.
4345
REQUEST_COUNT=10
44-
CLIENT=../clients/perf_client
46+
CLIENT=perf_analyzer
4547
# Only use libtorch as it accepts GPU I/O and it can handle variable shape
4648
BACKENDS=${BACKENDS:="libtorch"}
4749

-4.8 MB
Binary file not shown.

qa/L0_response_cache/test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,12 +426,13 @@ if [ "$SERVER_PID" == "0" ]; then
426426
exit 1
427427
fi
428428

429+
pip3 install perf_analyzer
429430

430431
TEMP_RET=0
431432
REPETITION=10
432433
CONCURRENCY=20
433434
CLIENT_BS=1
434-
PERF_ANALYZER=../clients/perf_analyzer
435+
PERF_ANALYZER=perf_analyzer
435436
TEMP_CLIENT_LOG=temp_client.log
436437

437438
set +e

0 commit comments

Comments
 (0)