Changing reference to test plugin location (triton-inference-server#5456

) * Removing variable concatenation in favor of condition * Adding verbose mode on copy
mailmahee · Mar 7, 2023 · bada50c · bada50c
1 parent f1aedd4
commit bada50c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/qa/L0_trt_plugin/test.sh b/qa/L0_trt_plugin/test.sh
@@ -50,13 +50,13 @@ PLUGIN_TEST=trt_plugin_test.py
 if [[ "$(< /proc/sys/kernel/osrelease)" == *microsoft* ]]; then
     DATADIR=${DATADIR:="/mnt/c/data/inferenceserver/${REPO_VERSION}"}
     MODELDIR=${MODELDIR:=C:/models}
-    CUSTOMPLUGIN=${CUSTOMPLUGIN:=clipplugin.dll}
+    CUSTOMPLUGIN=${CUSTOMPLUGIN:=$MODELDIR/clipplugin.dll}
     BACKEND_DIR=${BACKEND_DIR:=C:/tritonserver/backends}
     SERVER=${SERVER:=/mnt/c/tritonserver/bin/tritonserver.exe}
 else
     DATADIR=${DATADIR:="/data/inferenceserver/${REPO_VERSION}"}
     MODELDIR=${MODELDIR:=`pwd`/models}
-    CUSTOMPLUGIN=${CUSTOMPLUGIN:=libclipplugin.so}
+    CUSTOMPLUGIN=${CUSTOMPLUGIN:=$MODELDIR/libclipplugin.so}
     TRITON_DIR=${TRITON_DIR:="/opt/tritonserver"}
     BACKEND_DIR=${TRITON_DIR}/backends
     SERVER=${TRITON_DIR}/bin/tritonserver
@@ -77,7 +77,7 @@ LOG_IDX=0
 ## Create model folder with default plugin models
 rm -fr models && mkdir -p models
 set -e
-find $DATADIR/qa_trt_plugin_model_repository/ -mindepth 1 -maxdepth 1 ! -iname '*clipplugin*' -exec cp -r {} models \;
+find $DATADIR/qa_trt_plugin_model_repository/ -mindepth 1 -maxdepth 1 ! -iname '*clipplugin*' -exec cp -rv {} models \;
 
 SERVER_ARGS=$SERVER_ARGS_BASE
 SERVER_LOG="./inference_server_$LOG_IDX.log"
@@ -147,7 +147,7 @@ fi
 LOG_IDX=$((LOG_IDX+1))
 
 ## Backend Config, Single Plugin Test
-SERVER_ARGS="${SERVER_ARGS_BASE} --backend-config=tensorrt,plugins=${MODELDIR}/${CUSTOMPLUGIN}"
+SERVER_ARGS="${SERVER_ARGS_BASE} --backend-config=tensorrt,plugins=${CUSTOMPLUGIN}"
 SERVER_LOG="./inference_server_$LOG_IDX.log"
 
 run_server
@@ -179,7 +179,7 @@ kill_server
 LOG_IDX=$((LOG_IDX+1))
 
 ## Backend Config, Multiple Plugins Test
-SERVER_ARGS="${SERVER_ARGS_BASE} --backend-config=tensorrt,plugins=${MODELDIR}/${CUSTOMPLUGIN};${MODELDIR}/${CUSTOMPLUGIN}\""
+SERVER_ARGS="${SERVER_ARGS_BASE} --backend-config=tensorrt,plugins=${CUSTOMPLUGIN}"
 SERVER_LOG="./inference_server_$LOG_IDX.log"
 
 run_server
@@ -213,7 +213,7 @@ LOG_IDX=$((LOG_IDX+1))
 ## LD_PRELOAD, Single Plugin Test
 ## LD_PRELOAD is only on Linux
 
-SERVER_LD_PRELOAD=$MODELDIR/$CUSTOMPLUGIN
+SERVER_LD_PRELOAD=$CUSTOMPLUGIN
 SERVER_ARGS=$SERVER_ARGS_BASE
 SERVER_LOG="./inference_server_$LOG_IDX.log"