From 8492549290454509a335e2a9e0ddc1d6b91b2423 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Sat, 31 Aug 2024 02:23:51 -0700 Subject: [PATCH 1/3] Update error msg checks --- qa/L0_input_validation/input_validation_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/L0_input_validation/input_validation_test.py b/qa/L0_input_validation/input_validation_test.py index 33360b7a08..8d083ee66f 100755 --- a/qa/L0_input_validation/input_validation_test.py +++ b/qa/L0_input_validation/input_validation_test.py @@ -195,7 +195,7 @@ def get_input_array(input_size, np_dtype): triton_client.infer(model_name=model_name, inputs=inputs) err_str = str(e.exception) self.assertIn( - f"expected {input_size} string elements for inference input 'INPUT1', got {input_size-2}", + f"expected {input_size} string elements for inference input 'INPUT1' for model '{model_name}', got {input_size-2}", err_str, ) @@ -208,7 +208,7 @@ def get_input_array(input_size, np_dtype): triton_client.infer(model_name=model_name, inputs=inputs) err_str = str(e.exception) self.assertIn( - f"expected {input_size} string elements for inference input 'INPUT1', got {input_size+2}", + f"expected {input_size} string elements for inference input 'INPUT1' for model '{model_name}', got {input_size+2}", err_str, ) From dfab1942090935be9011188c6afb87e9493581f9 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Tue, 3 Sep 2024 11:59:57 -0700 Subject: [PATCH 2/3] Update early termination message check --- qa/L0_input_validation/input_validation_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/L0_input_validation/input_validation_test.py b/qa/L0_input_validation/input_validation_test.py index 8d083ee66f..8e7f58bb0c 100755 --- a/qa/L0_input_validation/input_validation_test.py +++ b/qa/L0_input_validation/input_validation_test.py @@ -208,7 +208,7 @@ def get_input_array(input_size, np_dtype): triton_client.infer(model_name=model_name, inputs=inputs) err_str = str(e.exception) self.assertIn( - f"expected {input_size} string elements for inference input 'INPUT1' for model '{model_name}', got {input_size+2}", + f"unexpected number of string elements {input_size+1} for inference input 'INPUT1' for model '{model_name}', expecting {input_size}", err_str, ) From 38ebd242c9fa9846060b8e39975a785f5aad49b6 Mon Sep 17 00:00:00 2001 From: Yingge He Date: Tue, 3 Sep 2024 23:32:19 -0700 Subject: [PATCH 3/3] Copy models to test folder --- qa/L0_input_validation/test.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/qa/L0_input_validation/test.sh b/qa/L0_input_validation/test.sh index fc70abd969..22e0560959 100755 --- a/qa/L0_input_validation/test.sh +++ b/qa/L0_input_validation/test.sh @@ -68,7 +68,9 @@ set +e python3 -m pytest --junitxml="input_validation.report.xml" $TEST_PY::InputValTest >> $CLIENT_LOG 2>&1 if [ $? -ne 0 ]; then - echo -e "\n***\n*** input_validation_test.py FAILED. \n***" + cat $CLIENT_LOG + cat $SERVER_LOG + echo -e "\n***\n*** input_validation_test.py::InputValTest FAILED. \n***" RET=1 fi set -e @@ -138,7 +140,9 @@ set +e python3 -m pytest --junitxml="input_shape_validation.report.xml" $TEST_PY::InputShapeTest >> $CLIENT_LOG 2>&1 if [ $? -ne 0 ]; then - echo -e "\n***\n*** input_validation_test.py FAILED. \n***" + cat $CLIENT_LOG + cat $SERVER_LOG + echo -e "\n***\n*** input_validation_test.py::InputShapeTest FAILED. \n***" RET=1 fi set -e @@ -147,10 +151,13 @@ kill $SERVER_PID wait $SERVER_PID # input_byte_size_test +cp -r /data/inferenceserver/${REPO_VERSION}/qa_identity_model_repository/{savedmodel_zero_1_float32,savedmodel_zero_1_object} ./models + set +e -LD_LIBRARY_PATH=/opt/tritonserver/lib:$LD_LIBRARY_PATH $TEST_EXEC >>$TEST_LOG 2>&1 +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***" + cat $TEST_LOG + echo -e "\n***\n*** input_byte_size_test FAILED\n***" RET=1 fi set -e @@ -158,8 +165,6 @@ set -e if [ $RET -eq 0 ]; then echo -e "\n***\n*** Input Validation Test Passed\n***" else - cat $CLIENT_LOG - cat $SERVER_LOG echo -e "\n***\n*** Input Validation Test FAILED\n***" fi