From dd4f3a68b8e7f01834ea6bfa89225ec4ab8851a5 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Tue, 25 Jun 2024 02:36:20 -0700 Subject: [PATCH 1/4] Update model and executable --- Dockerfile.QA | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile.QA b/Dockerfile.QA index 1287a9d877..3f3fc861e4 100644 --- a/Dockerfile.QA +++ b/Dockerfile.QA @@ -148,7 +148,11 @@ RUN mkdir -p qa/common && \ cp bin/request_cancellation_test qa/L0_request_cancellation/. && \ cp bin/triton_json_test qa/L0_json/. && \ cp bin/backend_output_detail_test qa/L0_backend_output_detail/. && \ - cp -r deploy/mlflow-triton-plugin qa/L0_mlflow/. + cp -r deploy/mlflow-triton-plugin qa/L0_mlflow/. && \ + cp bin/input_byte_size_test qa/L0_input_validation/. && \ + mkdir -p qa/L0_input_validation/models/string_identity/1 && \ + cp -r qa/python_models/string_identity/. qa/L0_input_validation/models/string_identity && \ + mv qa/L0_input_validation/models/string_identity/model.py qa/L0_input_validation/models/string_identity/1 RUN mkdir -p qa/pkgs && \ cp python/triton*.whl qa/pkgs/. && \ From 36a5401c594f36819ea380f683f13d4acc705061 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Tue, 25 Jun 2024 09:56:08 -0700 Subject: [PATCH 2/4] Update model input dims --- Dockerfile.QA | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.QA b/Dockerfile.QA index 3f3fc861e4..f8a90683df 100644 --- a/Dockerfile.QA +++ b/Dockerfile.QA @@ -152,7 +152,8 @@ RUN mkdir -p qa/common && \ cp bin/input_byte_size_test qa/L0_input_validation/. && \ mkdir -p qa/L0_input_validation/models/string_identity/1 && \ cp -r qa/python_models/string_identity/. qa/L0_input_validation/models/string_identity && \ - mv qa/L0_input_validation/models/string_identity/model.py qa/L0_input_validation/models/string_identity/1 + mv qa/L0_input_validation/models/string_identity/model.py qa/L0_input_validation/models/string_identity/1 && \ + sed -i "s/dims: \[ [0-9]\+ \]/dims: [ -1 ]/" "qa/L0_input_validation/models/string_identity/config.pbtxt" RUN mkdir -p qa/pkgs && \ cp python/triton*.whl qa/pkgs/. && \ From 98eac9f89f9a86edc7a8fd2ed8652a945f07de80 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Fri, 28 Jun 2024 15:52:49 -0700 Subject: [PATCH 3/4] Include new test in L0_input_validation test --- qa/L0_input_validation/test.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qa/L0_input_validation/test.sh b/qa/L0_input_validation/test.sh index 47a379c52b..be7054895c 100755 --- a/qa/L0_input_validation/test.sh +++ b/qa/L0_input_validation/test.sh @@ -46,9 +46,10 @@ DATADIR=/data/inferenceserver/${REPO_VERSION} SERVER=/opt/tritonserver/bin/tritonserver CLIENT_LOG="./input_validation_client.log" TEST_PY=./input_validation_test.py -SHAPE_TEST_PY=./input_shape_validation_test.py TEST_RESULT_FILE='./test_results.txt' SERVER_LOG="./inference_server.log" +TEST_LOG="./input_byte_size_test.log" +TEST_EXEC=./input_byte_size_test export CUDA_VISIBLE_DEVICES=0 @@ -143,6 +144,15 @@ set -e kill $SERVER_PID wait $SERVER_PID +# input_byte_size_test +set +e +LD_LIBRARY_PATH=/opt/tritonserver/lib:$LD_LIBRARY_PATH $TEST_EXEC >>$TEST_LOG 2>&1 +if [ $? -ne 0 ]; then + echo -e "\n***\n*** Query Unit Test Failed\n***" + RET=1 +fi +set -e + if [ $RET -eq 0 ]; then echo -e "\n***\n*** Input Validation Test Passed\n***" else From 4b80682203668f7e0365e65ab152356f4e164212 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Mon, 1 Jul 2024 17:45:43 -0700 Subject: [PATCH 4/4] Update the model used in input_byte_size_test --- Dockerfile.QA | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile.QA b/Dockerfile.QA index f8a90683df..2c43f735a5 100644 --- a/Dockerfile.QA +++ b/Dockerfile.QA @@ -150,10 +150,7 @@ RUN mkdir -p qa/common && \ cp bin/backend_output_detail_test qa/L0_backend_output_detail/. && \ cp -r deploy/mlflow-triton-plugin qa/L0_mlflow/. && \ cp bin/input_byte_size_test qa/L0_input_validation/. && \ - mkdir -p qa/L0_input_validation/models/string_identity/1 && \ - cp -r qa/python_models/string_identity/. qa/L0_input_validation/models/string_identity && \ - mv qa/L0_input_validation/models/string_identity/model.py qa/L0_input_validation/models/string_identity/1 && \ - sed -i "s/dims: \[ [0-9]\+ \]/dims: [ -1 ]/" "qa/L0_input_validation/models/string_identity/config.pbtxt" + cp -r docs/examples/model_repository/simple_identity qa/L0_input_validation/models RUN mkdir -p qa/pkgs && \ cp python/triton*.whl qa/pkgs/. && \