From d779357fecf8c6466055db8e7859bbcc0545877b Mon Sep 17 00:00:00 2001 From: Wook Song Date: Tue, 24 Sep 2019 12:27:22 +0900 Subject: [PATCH] [Tests/CustomFilters] Use default installation direcotory Tests which require custom shared library does not consider the tests using the unittest package (which means not the build time test). They uses hardcoded path to indicate the location of the shared library. In order to fix this problem, this patch makes the test use the default installation directory when the test is running using the unittest package. Signed-off-by: Wook Song --- tests/nnstreamer_filter_custom/runTest.sh | 21 +++++++++++++-------- tests/nnstreamer_repo_lstm/runTest.sh | 7 ++++++- tests/nnstreamer_repo_rnn/runTest.sh | 8 +++++++- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/nnstreamer_filter_custom/runTest.sh b/tests/nnstreamer_filter_custom/runTest.sh index 893a6be..e34ef99 100644 --- a/tests/nnstreamer_filter_custom/runTest.sh +++ b/tests/nnstreamer_filter_custom/runTest.sh @@ -43,8 +43,12 @@ convertBMP2PNG # Test gst availability. (0) gstTest "videotestsrc num-buffers=1 ! video/x-raw,format=RGB,width=280,height=40,framerate=0/1 ! videoconvert ! video/x-raw, format=RGB ! filesink location=\"testcase02.apitest.log\" sync=true" 0 0 0 $PERFORMANCE +if [ ! -d "${PATH_TO_PLUGIN}" ]; then + CUSTOMLIB_DIR=${CUSTOMLIB_DIR:="/usr/lib/nnstreamer/customfilters"} +fi + # Test constant passthrough custom filter (1, 2) -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then +if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL="../../build/nnstreamer_example/custom_example_passthrough/libnnstreamer_customfilter_passthrough.${SO_EXT}" else PATH_TO_MODEL="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_passthrough.${SO_EXT}" @@ -59,7 +63,8 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} videotestsrc num-buffers=1 ! video/ callCompareTest testcase02.direct.log testcase02.passthrough.log 2 "Compare 2" 0 0 # Test variable-dim passthrough custom filter (3, 4) -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then + +if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL_V="../../build/nnstreamer_example/custom_example_passthrough/libnnstreamer_customfilter_passthrough_variable.${SO_EXT}" else PATH_TO_MODEL_V="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_passthrough_variable.${SO_EXT}" @@ -80,7 +85,7 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} tensor_mux name=mux ! tee name=t ! callCompareTest testcase04.tensors.direct.log testcase04.tensors.passthrough.log 4-4 "Compare 4-4" 0 0 # Test scaler (5, 6, 7) -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then +if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL_S="../../build/nnstreamer_example/custom_example_scaler/libnnstreamer_customfilter_scaler.${SO_EXT}" else PATH_TO_MODEL_S="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_scaler.${SO_EXT}" @@ -97,7 +102,7 @@ python checkScaledTensor.py testcase07.direct.log 640 480 testcase07.scaled.log testResult $? 7 "Golden test comparison" 0 1 # Test average (8) -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then +if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL_A="../../build/nnstreamer_example/custom_example_average/libnnstreamer_customfilter_average.${SO_EXT}" else PATH_TO_MODEL_A="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_average.${SO_EXT}" @@ -112,7 +117,7 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} multifilesrc location=\"testsequenc gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} multifilesrc location=\"testsequence_%1d.png\" index=0 caps=\"image/png,framerate=\(fraction\)30/1\" ! pngdec ! videoconvert ! video/x-raw, format=RGB ! tensor_converter ! tee name=t ! queue ! tensor_filter framework=\"custom\" model=\"${PATH_TO_MODEL_S}\" custom=\"8x8\" ! filesink location=\"testcase10.average.log\" sync=true t. ! queue ! filesink location=\"testcase10.direct.log\" sync=true" 10 0 0 $PERFORMANCE # Test scaler + in-invoke allocator (11) -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then +if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL_SI="../../build/nnstreamer_example/custom_example_scaler/libnnstreamer_customfilter_scaler_allocator.${SO_EXT}" else PATH_TO_MODEL_SI="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_scaler_allocator.${SO_EXT}" @@ -125,7 +130,7 @@ testResult $? 11 "Golden test comparison" 0 1 # OpenCV Test # Test scaler using OpenCV (12, 13, 14) if [ "$TEST_OPENCV" == "YES" ]; then - if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then + if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL="../../build/nnstreamer_example/custom_example_opencv/libnnstreamer_customfilter_opencv_scaler.${SO_EXT}" else PATH_TO_MODEL="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_opencv_scaler.${SO_EXT}" @@ -148,7 +153,7 @@ if [ "$TEST_OPENCV" == "YES" ]; then # Test average using OpenCV (15) # custom version - if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then + if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL_A="../../build/nnstreamer_example/custom_example_average/libnnstreamer_customfilter_average.${SO_EXT}" else PATH_TO_MODEL_A="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_average.${SO_EXT}" @@ -156,7 +161,7 @@ if [ "$TEST_OPENCV" == "YES" ]; then gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} videotestsrc num-buffers=1 ! video/x-raw,format=RGB,width=640,height=480,framerate=0/1 ! videoconvert ! video/x-raw, format=RGB ! tensor_converter ! tensor_filter framework=\"custom\" model=\"${PATH_TO_MODEL_A}\" ! filesink location=\"testcase15.average.log\" sync=true" 15 0 0 $PERFORMANCE # OpenCV version - if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then + if [[ -z "${CUSTOMLIB_DIR}" ]]; then PATH_TO_MODEL_A="../../build/nnstreamer_example/custom_example_opencv/libnnstreamer_customfilter_opencv_average.${SO_EXT}" else PATH_TO_MODEL_A="${CUSTOMLIB_DIR}/libnnstreamer_customfilter_opencv_average.${SO_EXT}" diff --git a/tests/nnstreamer_repo_lstm/runTest.sh b/tests/nnstreamer_repo_lstm/runTest.sh index 5fe481d..465c098 100755 --- a/tests/nnstreamer_repo_lstm/runTest.sh +++ b/tests/nnstreamer_repo_lstm/runTest.sh @@ -31,7 +31,12 @@ if [[ "$SSATAPILOADED" != "1" ]]; then fi testInit $1 # You may replace this with Test Group Name -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then +PATH_TO_PLUGIN="../../build" +if [ ! -d "${PATH_TO_PLUGIN}" ]; then + CUSTOMLIB_DIR=${CUSTOMLIB_DIR:="/usr/lib/nnstreamer/customfilters"} +fi + +if [[ -z "${CUSTOMLIB_DIR}" ]]; then LSTM_DIR="../../build/nnstreamer_example/custom_example_LSTM" else LSTM_DIR="${CUSTOMLIB_DIR}" diff --git a/tests/nnstreamer_repo_rnn/runTest.sh b/tests/nnstreamer_repo_rnn/runTest.sh index a049d94..9349595 100755 --- a/tests/nnstreamer_repo_rnn/runTest.sh +++ b/tests/nnstreamer_repo_rnn/runTest.sh @@ -16,7 +16,13 @@ if [[ "$SSATAPILOADED" != "1" ]]; then fi testInit $1 # You may replace this with Test Group Name -if [[ -z "${CUSTOMLIB_DIR// /}" ]]; then + +PATH_TO_PLUGIN="../../build" +if [ ! -d "${PATH_TO_PLUGIN}" ]; then + CUSTOMLIB_DIR=${CUSTOMLIB_DIR:="/usr/lib/nnstreamer/customfilters"} +fi + +if [[ -z "${CUSTOMLIB_DIR}" ]]; then RNN_DIR="../../build/nnstreamer_example/custom_example_RNN" else RNN_DIR="${CUSTOMLIB_DIR}" -- 2.7.4