[runtime] Remove default LD_LIBRARY_PATH (#8876)
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Mon, 11 Nov 2019 05:45:05 +0000 (14:45 +0900)
committer이춘석/On-Device Lab(SR)/Staff Engineer/삼성전자 <chunseok.lee@samsung.com>
Mon, 11 Nov 2019 05:45:05 +0000 (14:45 +0900)
Remove LD_LIBRARY_PATH setting except pacl test because rpath is set on install

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
19 files changed:
docs/nnfw/howto/CrossBuildForArm.md
docs/nnfw/howto/HowToTestManualy.md
infra/scripts/test_arm_neurun_acl_cl.sh
infra/scripts/test_arm_neurun_acl_neon.sh
infra/scripts/test_arm_neurun_cpu.sh
infra/scripts/test_arm_neurun_mixed.sh
infra/scripts/test_arm_pacl.sh
infra/scripts/test_neurun_interp.sh
infra/scripts/test_tizen_neurun_acl_cl.sh
infra/scripts/test_tizen_neurun_mixed.sh
infra/scripts/test_x64_neurun_cpu.sh
tests/framework/run_test.sh
tests/scripts/README.md
tests/scripts/run_benchmark.sh
tests/scripts/run_benchmark_op.sh
tests/scripts/run_benchmark_tflite_model.sh
tests/scripts/run_frameworktest.sh
tests/scripts/test_driver.sh
tools/nnpackage_tool/nnpkg_test/nnpkg_test.sh

index 110dde8..94d1645 100644 (file)
@@ -106,7 +106,7 @@ normal build and cross build as follows.
 ```
 export ROOTFS_DIR = xxx
 ...
-make all install    # do normal build 
+make all install    # do normal build
 TARGET_ARCH = armv7l make all install    # do cross build
 ```
 
@@ -124,6 +124,5 @@ option(BUILD_NEURUN "Build neurun" ON)
 - neurun
 ```
  ./tests/scripts/test_driver.sh --artifactpath=. \
- --ldlibrarypath=Product/out/lib/neurun:Product/out/lib \
  --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt
 ```
index 75775cc..bb36cc6 100644 (file)
@@ -17,8 +17,6 @@
     * dataflow: `export EXECUTOR=Dataflow`
     * parallel: `export EXECUTOR=Parallel`
 
-3. Set library path: `export LD_LIBRARY_PATH=/path/to/nnfw/Product/armv7l-linux.debug/out/lib`
-
 ## Test NNFW through NNAPI
 
 ### Testing on random input
index 1419802..02d181a 100755 (executable)
@@ -20,17 +20,14 @@ export OP_BACKEND_ALLOPS=acl_cl
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux ./Product/out/unittest/nnapi_gtest.skip
 export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl/linear" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl/dataflow" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl/parallel" .
 
 # Test tflite_loader
@@ -39,7 +36,6 @@ source ./tests/scripts/test_driver.sh \
         --frameworktest \
         --framework_driverbin="$ROOT_PATH/Product/out/bin/tflite_loader_test_tool" \
         --frameworktest_list_file=tests/scripts/tflite_loader_list.armv7l.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl/tfliteloader" .
 
 popd > /dev/null
index 30bfc49..a2c7155 100755 (executable)
@@ -21,19 +21,16 @@ cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.acl_neon ./Product/ou
 export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_neon/linear" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_neon/dataflow" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_neon.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_neon/parallel" .
 
 # NCNN backend test
@@ -47,7 +44,6 @@ cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.ncnn ./Product/out/un
 echo "ExecInstance.*" > ./Product/out/unittest/test_neurun.skip
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.ncnn.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/ncnn" .
 
 popd > /dev/null
index f368071..ca07cc8 100755 (executable)
@@ -21,19 +21,16 @@ cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.cpu ./Product/out/uni
 export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/cpu/linear" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/cpu/dataflow" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/cpu/parallel" .
 
 popd > /dev/null
index d601ff0..5fc2376 100755 (executable)
@@ -38,7 +38,6 @@ done
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux ./Product/out/unittest/nnapi_gtest.skip
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=$TESTLIST_PREFIX.intersect.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib/neurun:$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/mixed" .
 
 popd > /dev/null
index eb50e26..0584775 100755 (executable)
@@ -16,9 +16,8 @@ set -e
 pushd $ROOT_PATH > /dev/null
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.pacl ./Product/out/unittest/nnapi_gtest.skip
-source ./tests/scripts/test_driver.sh \
-        --frameworktest_list_file=tests/scripts/pacl_frameworktest_list.armv7l-linux.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib/pureacl:$ROOT_PATH/Product/out/lib" \
-        --reportdir="$ROOT_PATH/report" .
+LD_LIBRARY_PATH=$ROOT_PATH/Product/out/lib/pureacl ./tests/scripts/test_driver.sh \
+  --frameworktest_list_file=tests/scripts/pacl_frameworktest_list.armv7l-linux.txt \
+  --reportdir="$ROOT_PATH/report" .
 
 popd > /dev/null
index 4162b17..3e0fa0f 100755 (executable)
@@ -19,7 +19,7 @@ export DISABLE_COMPILE=1
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.noarch.interp ./Product/out/unittest/nnapi_gtest.skip
 ./tests/scripts/test_driver.sh \
-  --ldlibrarypath=$ROOT_PATH/Product/out/lib --unittest \
+  --unittest \
   --reportdir="$ROOT_PATH/report/interp" .
 
 popd > /dev/null
index d098954..71c1cc6 100755 (executable)
@@ -14,17 +14,14 @@ export OP_BACKEND_ALLOPS=acl_cl
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-tizen ./Product/out/unittest/nnapi_gtest.skip
 export EXECUTOR=Linear
 source ./tests/scripts/test_driver.sh \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl" .
 
 export EXECUTOR=Dataflow
 source ./tests/scripts/test_driver.sh \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl" .
 
 export EXECUTOR=Parallel
 source ./tests/scripts/test_driver.sh \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/acl_cl" .
 
 popd > /dev/null
index b45c84f..abce9a6 100755 (executable)
@@ -32,7 +32,6 @@ done
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-tizen ./Product/out/unittest/nnapi_gtest.skip
 source ./tests/scripts/test_driver.sh \
         --frameworktest_list_file=$TESTLIST_PREFIX.intersect.txt \
-        --ldlibrarypath="$ROOT_PATH/Product/out/lib/neurun:$ROOT_PATH/Product/out/lib" \
         --reportdir="$ROOT_PATH/report/mixed" .
 
 popd > /dev/null
index 241ce42..7e32e02 100755 (executable)
@@ -19,7 +19,6 @@ export BACKENDS=cpu
 export OP_BACKEND_ALLOPS=cpu
 
 ./tests/scripts/test_driver.sh \
-  --ldlibrarypath=$ROOT_PATH/Product/out/lib \
   --frameworktest_list_file=./tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt \
   --reportdir=$ROOT_PATH/report/ .
 
index a59d6a3..84cfa9e 100755 (executable)
@@ -32,7 +32,6 @@ function Usage()
     echo "--driverbin           - (default=../../Product/out/bin/tflite_run) runner for runnning framework tests"
     echo "--reportdir           - (default=report) directory to place tap files"
     echo "--tapname             - (default=framework_test.tap) file name to be written for tap"
-    echo "--ldlibrarypath       - (default=${NNFW_HOME}/Product/out/lib) path to '*.so' files"
     echo ""
 }
 
@@ -59,7 +58,6 @@ function need_download()
 }
 
 DRIVER_BIN=""
-NNFW_LD_LIBRARY_PATH=""
 TAP_NAME="framework_test.tap"
 TEST_LIST=()
 DOWNLOAD_MODE="off"
@@ -86,9 +84,6 @@ do
         --download=*)
             DOWNLOAD_MODE=${i#*=}
             ;;
-        --ldlibrarypath=*)
-            NNFW_LD_LIBRARY_PATH=${i#*=}
-            ;;
         *)
             TEST_LIST+=( $i )
             ;;
@@ -123,12 +118,6 @@ run_tests()
     done
     echo "======================"
 
-    if [ -z "$NNFW_LD_LIBRARY_PATH" ]; then
-        NNFW_LD_LIBRARY_PATH="$NNFW_HOME/Product/out/lib/"
-    else
-        NNFW_LD_LIBRARY_PATH="$NNFW_LD_LIBRARY_PATH:$NNFW_HOME/Product/out/lib/"
-    fi
-
     TOTAL_RESULT=0  # 0(normal) or 1(abnormal)
     i=0
     for TEST_NAME in $SELECTED_TESTS; do
@@ -187,7 +176,7 @@ run_tests()
         echo "======================"
 
         # Run driver to test framework
-        LD_LIBRARY_PATH="${NNFW_LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}" $DRIVER_BIN $MODELFILE
+        $DRIVER_BIN $MODELFILE
 
         #$DRIVER_BIN $MODELFILE
         if [[ $? -eq 0 ]]; then
index 66a197d..a764f27 100644 (file)
@@ -14,8 +14,7 @@ $ ./tests/scripts/test_driver.sh \
 - The `run_unittest.sh` usage :
 
 ```
-$ LD_LIBRARY_PATH=Product/out/lib \
-    ./tests/scripts/run_unittest.sh \
+$ ./tests/scripts/run_unittest.sh \
     --reportdir=report \
     --unittestdir=Product/out/unittest
 ```
@@ -51,7 +50,7 @@ $ ./tests/scripts/test_driver.sh \
 ### Run nnapi_test with various tflite models
 - `nnapi_test` runs tflite in two ways and compares the result:
     1. tflite interpreter
-    2. `libneuralnetworks.so`, which could be PureACL or NNAPI depending on `--ldlibrarypath`(`LD_LIBRARY_PATH`)
+    2. `libneuralnetworks.so`, which could be PureACL or neurun depending on linked to nnapi_test
 - Driver : `nnapi_test`
 - Driver source location : `tools/nnapi_test/`
 - Usage :
@@ -60,4 +59,3 @@ $ ./tests/scripts/test_driver.sh \
     --artifactpath=. \
     --verification .
 ```
-
index e22b400..a6f96c9 100755 (executable)
@@ -27,7 +27,7 @@ BENCHMARK_MODEL_LIST="MODELS/inception_nonslim MODELS/inception_slim MODELS/mobi
 function Usage()
 {
     # TODO: Fill this
-    echo "Usage: LD_LIBRARY_PATH=Product/out/lib ./$0 --reportdir=report"
+    echo "Usage: ./$0 --reportdir=report"
 }
 
 for i in "$@"
index a9c7432..2e68049 100755 (executable)
@@ -25,15 +25,12 @@ BENCHMARK_MODELS_FILE=
 BENCHMARK_MODEL_LIST=
 MODEL_CACHE_ROOT_PATH=
 MODEL_TEST_ROOT_PATH=
-PURE_ACL_RT_LIB_PATH=
-PURE_LD_LIBRARY_PATH=
-ORIGIN_LD_LIBRARY_PATH=
 PURE_ACL_RT_ENV_FILE=$MY_PATH/benchmark_op_list.txt
 
 function Usage()
 {
     # TODO: Fill this
-    echo "Usage: LD_LIBRARY_PATH=Product/out/lib ./$0 --reportdir=report"
+    echo "Usage: LD_LIBRARY_PATH=Product/out/lib/pureacl ./$0 --reportdir=report"
 }
 
 for i in "$@"
@@ -68,10 +65,9 @@ function get_result_of_benchmark_test()
     local DRIVER_BIN=$2
     local MODEL=$3
     local LOG_FILE=$4
-    local PUREACL_LD_LIBRARY_PATH=$5
 
     local RET=0
-    $RUN_TEST_SH --driverbin=$DRIVER_BIN --ldlibrarypath=$PUREACL_LD_LIBRARY_PATH $MODEL > $LOG_FILE 2>&1
+    $RUN_TEST_SH --driverbin=$DRIVER_BIN $MODEL > $LOG_FILE 2>&1
     RET=$?
     if [[ $RET -ne 0 ]]; then
         echo "Testing $MODEL aborted... exit code: $RET"
@@ -189,10 +185,6 @@ if [ ! -e "$BENCHMARK_REPORT_DIR" ]; then
     mkdir -p $BENCHMARK_REPORT_DIR
 fi
 
-if [ -z "$PURE_ACL_RT_LIB_PATH" ]; then
-    PURE_ACL_RT_LIB_PATH="$NNFW_HOME/Product/out/lib/pureacl"
-fi
-
 get_benchmark_op_list
 
 rm -rf $BENCHMARK_MODELS_FILE
index 3bc1851..c604b18 100755 (executable)
@@ -18,7 +18,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 NNFW_DIR="$(dirname "$(dirname "${SCRIPT_DIR}")")"
 REPORT_DIR="$NNFW_DIR/report/tflite_benchmark_model"
 MODEL_ROOT="$NNFW_DIR/tests/framework/tests"
-LD_LIBRARY_PATH="$NNFW_DIR/Product/out/lib/pureacl:$NNFW_DIR/Product/out/lib"
+LD_LIBRARY_PATH="$NNFW_DIR/Product/out/lib/pureacl"
 
 RUN_TEST=$NNFW_DIR/tests/framework/run_test.sh
 MODEL_IN=${BASH_SOURCE[0]%.sh}.in
@@ -31,7 +31,7 @@ source $SCRIPT_DIR/common.sh
 usage()
 {
   echo
-  echo "Usage: LD_LIBRARY_PATH=Product/out/lib $(basename ${BASH_SOURCE[0]}) --reportdir=report --modelroot=modelroot"
+  echo "Usage: LD_LIBRARY_PATH=Product/out/lib/pureacl $(basename ${BASH_SOURCE[0]}) --reportdir=report --modelroot=modelroot"
   echo
 }
 
index bf36d0c..df840df 100755 (executable)
@@ -24,7 +24,7 @@ FWTEST_TEST_NAME=
 function Usage()
 {
     echo "Usage Example:"
-    echo "LD_LIBRARY_PATH=Product/out/lib ./$0 \\"
+    echo "./$0 \\"
     echo "  --runtestsh=tests/framework/run_test.sh \\ # Test runner script path"
     echo "  --driverbin=Product/out/bin/tflite_run \\  # Test driver path"
     echo "  --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt \\"
index a5dbf4a..ecba478 100755 (executable)
@@ -49,7 +49,6 @@ function Usage()
     echo "--runtestsh               - (default=\$ARTIFACT_PATH/tests/framework/run_test.sh) run_test.sh with path where it is for framework test and verification"
     echo "--unittestdir             - (default=\$ARTIFACT_PATH/Product/out/unittest) directory that has unittest binaries for unit test"
     echo ""
-    echo "--ldlibrarypath           - (default=\$ARTIFACT_PATH/Product/out/lib) path that you want to include libraries"
     echo "--usennapi                - (default=on)  declare USE_NNAPI=1"
     echo "--nousennapi              - (default=off) declare nothing about USE_NNAPI"
     echo "--acl_envon               - (default=off) declare envs for ACL"
@@ -64,7 +63,6 @@ VERIFICATION_DRIVER_BIN=""
 BENCHMARK_DRIVER_BIN=""
 RUN_TEST_SH=""
 UNIT_TEST_DIR=""
-LD_LIBRARY_PATH_IN_SHELL=""
 USE_NNAPI="USE_NNAPI=1"
 ALLTEST_ON="true"
 UNITTEST_ON="false"
@@ -103,9 +101,6 @@ do
         --unittestdir=*)
             UNIT_TEST_DIR=${i#*=}
             ;;
-        --ldlibrarypath=*)
-            LD_LIBRARY_PATH_IN_SHELL=${i#*=}
-            ;;
         --usennapi)
             USE_NNAPI="USE_NNAPI=1"
             ;;
@@ -189,14 +184,7 @@ if [ -z "$REPORT_DIR" ]; then
     REPORT_DIR=$ARTIFACT_PATH/report
 fi
 
-if [ -z "$LD_LIBRARY_PATH_IN_SHELL" ]; then
-    LD_LIBRARY_PATH="$ARTIFACT_PATH/Product/out/lib:$LD_LIBRARY_PATH"
-else
-    LD_LIBRARY_PATH="$LD_LIBRARY_PATH_IN_SHELL:$LD_LIBRARY_PATH"
-fi
-
 # Set env
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 if [ -n "$USE_NNAPI" ]; then
     export "$USE_NNAPI"
 fi
index 42c3ac4..00b7a0e 100755 (executable)
@@ -85,7 +85,7 @@ dumped="$outdir/$tcname".out.h5
 
 echo -n "[  Run  ] $nnpkg "
 
-if LD_LIBRARY_PATH=Product/out/lib $nnpkg_run \
+if $nnpkg_run \
 --nnpackage "$nnpkg" \
 --load "$nnpkg/metadata/tc/input.h5" \
 --dump "$dumped" >& /dev/null > "$dumped.log" 2>&1 ; then