Skip to content

Commit

Permalink
Exclude extra TRT version-compatible models from tests (#6294)
Browse files Browse the repository at this point in the history
* Exclude compatible models from tests.

* Force model removal, in case it does not exist

Co-authored-by: Ryan McCormick <rmccormick@nvidia.com>

---------

Co-authored-by: Ryan McCormick <rmccormick@nvidia.com>
  • Loading branch information
dyastremsky and rmccorm4 committed Sep 11, 2023
1 parent c386600 commit c346506
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
4 changes: 4 additions & 0 deletions qa/L0_infer_zero/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ rm -fr models && mkdir models
cp -r /data/inferenceserver/${REPO_VERSION}/qa_identity_model_repository/* models/. && \
cp -r /data/inferenceserver/${REPO_VERSION}/qa_ensemble_model_repository/qa_identity_model_repository/* models/.

# Remove version-compatible TensorRT models, as they require version-compatibility
# mode to be turned on when starting the server.
rm -rf models/plan_compatible*

create_nop_version_dir `pwd`/models

RET=0
Expand Down
14 changes: 10 additions & 4 deletions qa/L0_nullchar_string/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,22 @@ fi

export CUDA_VISIBLE_DEVICES=0

CLIENT_LOG="./client.log"
DATADIR=/data/inferenceserver/${REPO_VERSION}/qa_identity_model_repository
MODELS="graphdef_nobatch_zero_1_object savedmodel_nobatch_zero_1_object"
NULLCHAR_CLIENT_PY=nullchar_string_client.py
CLIENT_LOG="./client.log"

SERVER=/opt/tritonserver/bin/tritonserver
SERVER_ARGS="--model-repository=$DATADIR"
SERVER_ARGS="--model-repository=models"
SERVER_LOG="./inference_server.log"
source ../common/util.sh

rm -f $CLIENT_LOG $SERVER_LOG
rm -f $CLIENT_LOG $SERVER_LOG models

mkdir -p models
for MODEL in $MODELS; do
cp -r $DATADIR/$MODEL models/.
done

run_server
if [ "$SERVER_PID" == "0" ]; then
Expand All @@ -65,7 +71,7 @@ set +e
# Ignore ONNX backend because even though ONNX supports string data type,
# strings that contain null character in the middle is not allowed.
# https://github.com/microsoft/onnxruntime/issues/2284
for MODEL in graphdef_nobatch_zero_1_object savedmodel_nobatch_zero_1_object; do
for MODEL in $MODELS; do
python $NULLCHAR_CLIENT_PY -m $MODEL -v >>$CLIENT_LOG 2>&1
if [ $? -ne 0 ]; then
RET=1
Expand Down

0 comments on commit c346506

Please sign in to comment.