@@ -298,14 +298,26 @@ cp -r /data/inferenceserver/${REPO_VERSION}/qa_model_repository/openvino_int8_in
298298cp /data/inferenceserver/${REPO_VERSION} /qa_model_repository/openvino_int8_int8_int8/output0_labels.txt \
299299 autofill_noplatform_success/openvino/partial_config
300300
301- # Copy decoupled model into the model_metrics test repository.
301+ # Copy decoupled model and config files into the model_metrics test repository.
302302for modelpath in ` ls -d model_metrics/* /* ` ; do
303303 src_dir=" /opt/tritonserver/qa/python_models/async_execute_decouple"
304304 mkdir -p $modelpath /1
305305 cp $src_dir /model.py $modelpath /1/.
306306 cat $src_dir /config.pbtxt $modelpath /partial.pbtxt > $modelpath /config.pbtxt
307307done
308308
309+ # Copy tensorrt model and config files into the custom_parameters test repository.
310+ for modelpath in ` ls -d custom_parameters/tensorrt/* /* ` ; do
311+ mkdir -p $modelpath /1
312+ model_name=` basename $modelpath `
313+ src_dir=" /data/inferenceserver/${REPO_VERSION} /qa_model_repository/plan_float32_float32_float32"
314+ cp ${src_dir} /1/model.plan $modelpath /1/.
315+ cat ${src_dir} /config.pbtxt $modelpath /partial.pbtxt > $modelpath /config.pbtxt
316+ sed -i " s/^name:.*/name: \" ${model_name} \" /" $modelpath /config.pbtxt
317+ sed -i " s/^version_policy:.*//" $modelpath /config.pbtxt
318+ sed -i " s/label_filename:.*//" $modelpath /config.pbtxt
319+ done
320+
309321rm -f $SERVER_LOG_BASE * $CLIENT_LOG
310322RET=0
311323
@@ -694,6 +706,82 @@ for TARGET_DIR in `ls -d model_metrics/invalid_config/*`; do
694706 fi
695707done
696708
709+ # Run all custom_parameters tests that are expected to succeed.
710+ for TARGET_DIR in ` ls -d custom_parameters/* /valid/* ` ; do
711+ TARGET_DIR_DOT=` echo $TARGET_DIR | tr / .`
712+ TARGET=` basename ${TARGET_DIR} `
713+
714+ SERVER_ARGS=" --model-repository=` pwd` /models --log-info=true"
715+ SERVER_LOG=$SERVER_LOG_BASE .${TARGET_DIR_DOT} .log
716+
717+ rm -fr models && mkdir models
718+ cp -r ${TARGET_DIR} models/.
719+
720+ EXPECTED=models/$TARGET /expected
721+ echo -e " Test $TARGET_DIR " >> $CLIENT_LOG
722+
723+ run_server
724+ if [ " $SERVER_PID " == " 0" ]; then
725+ echo -e " *** FAILED: unable to start $SERVER " >> $CLIENT_LOG
726+ RET=1
727+ else
728+ kill $SERVER_PID
729+ wait $SERVER_PID
730+ fi
731+
732+ if [ -f $EXPECTED ]; then
733+ EX_FOUND=0
734+ EX=` cat $EXPECTED `
735+ if grep ^I[0-9][0-9][0-9][0-9].* " $EX " $SERVER_LOG ; then
736+ echo -e " Found \" $EX \" " >> $CLIENT_LOG
737+ EX_FOUND=1
738+ else
739+ echo -e " Not found \" $EX \" " >> $CLIENT_LOG
740+ fi
741+ if [ " $EX_FOUND " == " 0" ]; then
742+ echo -e " *** FAILED: model_metrics/$TARGET " >> $CLIENT_LOG
743+ RET=1
744+ fi
745+ fi
746+ done
747+
748+ # Run all custom_parameters tests that have invalid values.
749+ for TARGET_DIR in ` ls -d custom_parameters/* /invalid/* ` ; do
750+ TARGET_DIR_DOT=` echo $TARGET_DIR | tr / .`
751+ TARGET=` basename ${TARGET_DIR} `
752+
753+ SERVER_ARGS=" --model-repository=` pwd` /models --log-info=true"
754+ SERVER_LOG=$SERVER_LOG_BASE .${TARGET_DIR_DOT} .log
755+
756+ rm -fr models && mkdir models
757+ cp -r ${TARGET_DIR} models/.
758+
759+ EXPECTED=models/$TARGET /expected
760+ echo -e " Test $TARGET_DIR " >> $CLIENT_LOG
761+
762+ # We expect all tests to fail with the expected error message
763+ run_server
764+ if [ " $SERVER_PID " != " 0" ]; then
765+ echo -e " *** FAILED: unexpected success starting $SERVER " >> $CLIENT_LOG
766+ RET=1
767+ kill $SERVER_PID
768+ wait $SERVER_PID
769+ else
770+ EX_FOUND=0
771+ EX=` cat $EXPECTED `
772+ if grep ^E[0-9][0-9][0-9][0-9].* " $EX " $SERVER_LOG ; then
773+ echo -e " Found \" $EX \" " >> $CLIENT_LOG
774+ EX_FOUND=1
775+ else
776+ echo -e " Not found \" $EX \" " >> $CLIENT_LOG
777+ fi
778+ if [ " $EX_FOUND " == " 0" ]; then
779+ echo -e " *** FAILED: model_metrics/$TARGET " >> $CLIENT_LOG
780+ RET=1
781+ fi
782+ fi
783+ done
784+
697785if [ $RET -eq 0 ]; then
698786 echo -e " \n***\n*** Test Passed\n***"
699787else
0 commit comments