summaryrefslogtreecommitdiff
path: root/scripts/standalone
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/standalone')
-rwxr-xr-xscripts/standalone/docker_build_cross_arm.sh3
-rwxr-xr-xscripts/standalone/docker_build_cross_arm_benchmark_model.sh2
-rwxr-xr-xscripts/standalone/docker_build_cross_arm_neurun.sh3
-rwxr-xr-xscripts/standalone/docker_build_cross_arm_neurun_release.sh3
-rwxr-xr-xscripts/standalone/docker_build_cross_arm_release.sh3
-rwxr-xr-xscripts/standalone/docker_build_cross_coverage.sh3
-rwxr-xr-xscripts/standalone/docker_build_test_x64.sh5
-rwxr-xr-xscripts/standalone/test_arm.sh6
-rwxr-xr-xscripts/standalone/test_arm_neurun_acl_cl.sh8
-rwxr-xr-xscripts/standalone/test_arm_neurun_acl_neon.sh6
-rwxr-xr-xscripts/standalone/test_arm_neurun_cpu.sh6
11 files changed, 24 insertions, 24 deletions
diff --git a/scripts/standalone/docker_build_cross_arm.sh b/scripts/standalone/docker_build_cross_arm.sh
index ab46b29bd..6520b7f48 100755
--- a/scripts/standalone/docker_build_cross_arm.sh
+++ b/scripts/standalone/docker_build_cross_arm.sh
@@ -39,7 +39,8 @@ set -e
pushd $ROOT_PATH > /dev/null
# TODO use command instead of makefile
-CMD="make && \
+CMD="export OPTIONS='-DBUILD_NEURUN=OFF -DBUILD_PURE_ARM_COMPUTE=ON' && \
+ make && \
make install && \
make build_test_suite"
source nnfw docker-run-user bash -c "${CMD}"
diff --git a/scripts/standalone/docker_build_cross_arm_benchmark_model.sh b/scripts/standalone/docker_build_cross_arm_benchmark_model.sh
index b5c35c28e..38c7a5c8b 100755
--- a/scripts/standalone/docker_build_cross_arm_benchmark_model.sh
+++ b/scripts/standalone/docker_build_cross_arm_benchmark_model.sh
@@ -42,7 +42,7 @@ set -e
pushd $ROOT_PATH > /dev/null
# TODO use command instead of makefile
-CMD="export OPTIONS='-DBUILD_PURE_ARM_COMPUTE=ON -DBUILD_TFLITE_BENCHMARK_MODEL=ON' && \
+CMD="export OPTIONS='-DBUILD_PURE_ARM_COMPUTE=ON -DBUILD_NEURUN=OFF -DBUILD_TFLITE_BENCHMARK_MODEL=ON' && \
make && \
make install && \
make build_test_suite"
diff --git a/scripts/standalone/docker_build_cross_arm_neurun.sh b/scripts/standalone/docker_build_cross_arm_neurun.sh
index 164687c41..4d768ee06 100755
--- a/scripts/standalone/docker_build_cross_arm_neurun.sh
+++ b/scripts/standalone/docker_build_cross_arm_neurun.sh
@@ -40,8 +40,7 @@ set -e
pushd $ROOT_PATH > /dev/null
# TODO use command instead of makefile
-CMD="export OPTIONS='-DBUILD_NEURUN=ON -DBUILD_PURE_ARM_COMPUTE=OFF' && \
- make && \
+CMD="make && \
make install && \
make build_test_suite"
source nnfw docker-run-user bash -c "$CMD"
diff --git a/scripts/standalone/docker_build_cross_arm_neurun_release.sh b/scripts/standalone/docker_build_cross_arm_neurun_release.sh
index eec7e6b52..893d9a788 100755
--- a/scripts/standalone/docker_build_cross_arm_neurun_release.sh
+++ b/scripts/standalone/docker_build_cross_arm_neurun_release.sh
@@ -41,8 +41,7 @@ set -e
pushd $ROOT_PATH > /dev/null
# TODO use command instead of makefile
-CMD="export OPTIONS='-DBUILD_NEURUN=ON -DBUILD_PURE_ARM_COMPUTE=OFF' && \
- make && \
+CMD="make && \
make install && \
make build_test_suite"
source nnfw docker-run-user bash -c "$CMD"
diff --git a/scripts/standalone/docker_build_cross_arm_release.sh b/scripts/standalone/docker_build_cross_arm_release.sh
index 404cb6662..54b2d073e 100755
--- a/scripts/standalone/docker_build_cross_arm_release.sh
+++ b/scripts/standalone/docker_build_cross_arm_release.sh
@@ -41,7 +41,8 @@ set -e
pushd $ROOT_PATH > /dev/null
# TODO use command instead of makefile
-CMD="make && \
+CMD="export OPTIONS='-DBUILD_NEURUN=OFF -DBUILD_PURE_ARM_COMPUTE=ON' && \
+ make && \
make install && \
make build_test_suite"
source nnfw docker-run-user bash -c "${CMD}"
diff --git a/scripts/standalone/docker_build_cross_coverage.sh b/scripts/standalone/docker_build_cross_coverage.sh
index c01c30865..85fbb575b 100755
--- a/scripts/standalone/docker_build_cross_coverage.sh
+++ b/scripts/standalone/docker_build_cross_coverage.sh
@@ -47,8 +47,7 @@ set -e
pushd $ROOT_PATH > /dev/null
# TODO use command instead of makefile
-CMD="export OPTIONS+='-DBUILD_NEURUN=ON -DBUILD_PURE_ARM_COMPUTE=OFF' && \
- make && \
+CMD="make && \
make install && \
make build_coverage_suite"
source nnfw docker-run-user bash -c "$CMD"
diff --git a/scripts/standalone/docker_build_test_x64.sh b/scripts/standalone/docker_build_test_x64.sh
index f9af739ba..0d66eb14d 100755
--- a/scripts/standalone/docker_build_test_x64.sh
+++ b/scripts/standalone/docker_build_test_x64.sh
@@ -19,8 +19,7 @@ set -e
pushd $ROOT_PATH > /dev/null
-CMD="export OPTIONS+='-DBUILD_NEURUN=ON -DBUILD_PURE_ARM_COMPUTE=OFF' && \
- make && \
+CMD="make && \
make install && \
make build_test_suite"
@@ -36,7 +35,7 @@ DOCKER_ENV_VARS+=" -e BACKENDS=cpu"
DOCKER_ENV_VARS+=" -e OP_BACKEND_ALLOPS=cpu"
source nnfw docker-run-user ./tests/scripts/test_driver.sh \
- --ldlibrarypath=$ROOT_PATH/Product/out/lib/neurun \
+ --ldlibrarypath=$ROOT_PATH/Product/out/lib \
--frameworktest_list_file=./tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt \
--reportdir=$ROOT_PATH/report/ .
diff --git a/scripts/standalone/test_arm.sh b/scripts/standalone/test_arm.sh
index 211e1fb39..eb50e2610 100755
--- a/scripts/standalone/test_arm.sh
+++ b/scripts/standalone/test_arm.sh
@@ -15,6 +15,10 @@ set -e
pushd $ROOT_PATH > /dev/null
-source ./tests/scripts/test_driver.sh .
+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" .
popd > /dev/null
diff --git a/scripts/standalone/test_arm_neurun_acl_cl.sh b/scripts/standalone/test_arm_neurun_acl_cl.sh
index 094fc3fb9..6fb9b10cb 100755
--- a/scripts/standalone/test_arm_neurun_acl_cl.sh
+++ b/scripts/standalone/test_arm_neurun_acl_cl.sh
@@ -17,17 +17,15 @@ pushd $ROOT_PATH > /dev/null
export OP_BACKEND_ALLOPS=acl_cl
-cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.neurun ./Product/out/unittest/nnapi_gtest.skip
+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 \
- --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt \
- --ldlibrarypath="$ROOT_PATH/Product/out/lib/neurun:$ROOT_PATH/Product/out/lib" \
+ --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
--reportdir="$ROOT_PATH/report/acl_cl" .
export EXECUTOR=Dataflow
source ./tests/scripts/test_driver.sh \
- --frameworktest_list_file=tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt \
- --ldlibrarypath="$ROOT_PATH/Product/out/lib/neurun:$ROOT_PATH/Product/out/lib" \
+ --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
--reportdir="$ROOT_PATH/report/acl_cl" .
popd > /dev/null
diff --git a/scripts/standalone/test_arm_neurun_acl_neon.sh b/scripts/standalone/test_arm_neurun_acl_neon.sh
index c50972aa6..2381adb30 100755
--- a/scripts/standalone/test_arm_neurun_acl_neon.sh
+++ b/scripts/standalone/test_arm_neurun_acl_neon.sh
@@ -17,17 +17,17 @@ pushd $ROOT_PATH > /dev/null
export OP_BACKEND_ALLOPS=acl_neon
-cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon ./Product/out/unittest/nnapi_gtest.skip
+cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.acl_neon ./Product/out/unittest/nnapi_gtest.skip
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/neurun:$ROOT_PATH/Product/out/lib" \
+ --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
--reportdir="$ROOT_PATH/report/acl_neon" .
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/neurun:$ROOT_PATH/Product/out/lib" \
+ --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
--reportdir="$ROOT_PATH/report/acl_neon" .
diff --git a/scripts/standalone/test_arm_neurun_cpu.sh b/scripts/standalone/test_arm_neurun_cpu.sh
index 11513d3b1..25f9adfc7 100755
--- a/scripts/standalone/test_arm_neurun_cpu.sh
+++ b/scripts/standalone/test_arm_neurun_cpu.sh
@@ -17,17 +17,17 @@ pushd $ROOT_PATH > /dev/null
export OP_BACKEND_ALLOPS=cpu
-cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.neurun.cpu ./Product/out/unittest/nnapi_gtest.skip
+cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.cpu ./Product/out/unittest/nnapi_gtest.skip
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/neurun:$ROOT_PATH/Product/out/lib" \
+ --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
--reportdir="$ROOT_PATH/report/cpu" .
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/neurun:$ROOT_PATH/Product/out/lib" \
+ --ldlibrarypath="$ROOT_PATH/Product/out/lib" \
--reportdir="$ROOT_PATH/report/cpu" .
popd > /dev/null