From 0b3ce387e1acfbd0ffe40c58391265d00b4c6cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?UTF-8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Tue, 23 Apr 2019 16:09:14 +0900 Subject: Change default runtime to neurun (#5042) * Change default runtime to neurun Change default runtime: pacl -> neurun Signed-off-by: Hyeongseok Oh * Enable loggin runtime default --- cmake/CfgOptionFlags.cmake | 3 +- cmake/options/options_aarch64-linux.cmake | 1 - cmake/options/options_aarch64-tizen.cmake | 1 - cmake/options/options_arm64-android.cmake | 1 - cmake/options/options_armv7l-linux.cmake | 1 - cmake/options/options_armv7l-tizen.cmake | 1 - cmake/options/options_x86_64-linux.cmake | 1 - packaging/nnfw.spec | 4 +- runtimes/neurun/backend/acl_cl/CMakeLists.txt | 2 +- runtimes/neurun/backend/acl_common/CMakeLists.txt | 2 +- runtimes/neurun/backend/acl_neon/CMakeLists.txt | 2 +- runtimes/neurun/backend/cpu/CMakeLists.txt | 2 +- runtimes/neurun/frontend/nnapi/CMakeLists.txt | 2 +- runtimes/pure_arm_compute/CMakeLists.txt | 1 - scripts/standalone/docker_build_cross_arm.sh | 3 +- .../docker_build_cross_arm_benchmark_model.sh | 2 +- .../standalone/docker_build_cross_arm_neurun.sh | 3 +- .../docker_build_cross_arm_neurun_release.sh | 3 +- .../standalone/docker_build_cross_arm_release.sh | 3 +- scripts/standalone/docker_build_cross_coverage.sh | 3 +- scripts/standalone/docker_build_test_x64.sh | 5 +- scripts/standalone/test_arm.sh | 6 +- scripts/standalone/test_arm_neurun_acl_cl.sh | 8 +- scripts/standalone/test_arm_neurun_acl_neon.sh | 6 +- scripts/standalone/test_arm_neurun_cpu.sh | 6 +- tests/framework/tests/MODELS/mobilenet/config.sh | 1 - tests/framework/tests/concat/2D/config.sh | 1 - tests/framework/tests/exp/config.sh | 1 - tests/framework/tests/logistic/config.sh | 1 + tests/framework/tests/neg/config.sh | 1 - tests/framework/tests/pad/4D_2D/config.sh | 1 + tests/framework/tests/reduce_max/config.sh | 2 - tests/framework/tests/reduce_mean/test1/config.sh | 2 - tests/framework/tests/reduce_mean/test2/config.sh | 2 - tests/framework/tests/rsqrt/config.sh | 1 - tests/nnapi/CMakeLists.txt | 4 +- tests/nnapi/nnapi_gtest.skip.armv7l-linux | 55 ++++------ tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon | 88 ++++++++++++++++ tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu | 78 ++++++++++++++ tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun | 19 ---- .../nnapi_gtest.skip.armv7l-linux.neurun.acl_neon | 88 ---------------- .../nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu | 78 -------------- tests/nnapi/nnapi_gtest.skip.armv7l-linux.pacl | 38 +++++++ tests/nnapi/nnapi_gtest.skip.x86_64-linux | 114 +++++++++++++++++++++ tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun | 114 --------------------- .../neurun_frameworktest_list.armv7l.acl_cl.txt | 45 -------- .../pacl_frameworktest_list.armv7l-linux.txt | 36 +++++++ 47 files changed, 409 insertions(+), 433 deletions(-) create mode 100644 tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon create mode 100644 tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu delete mode 100644 tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun delete mode 100644 tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon delete mode 100644 tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu create mode 100644 tests/nnapi/nnapi_gtest.skip.armv7l-linux.pacl create mode 100644 tests/nnapi/nnapi_gtest.skip.x86_64-linux delete mode 100644 tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun delete mode 100644 tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt create mode 100644 tests/scripts/pacl_frameworktest_list.armv7l-linux.txt diff --git a/cmake/CfgOptionFlags.cmake b/cmake/CfgOptionFlags.cmake index 02997b61b..468229a15 100644 --- a/cmake/CfgOptionFlags.cmake +++ b/cmake/CfgOptionFlags.cmake @@ -11,8 +11,9 @@ include("cmake/options/options_${TARGET_PLATFORM}.cmake") # Build configuration for project # option(BUILD_EXT_MULTITHREAD "Build external build using multi thread" ON) -option(BUILD_NEURUN "Build neurun" OFF) #if implementation is done, it would replace nn runtime. +option(BUILD_NEURUN "Build neurun" ON) option(BUILD_LOGGING "Build logging runtime" ON) +option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" OFF) CMAKE_DEPENDENT_OPTION(BUILD_RUNTIME_NNAPI_TEST "Build Runtime NN API Generated Test" # Set BUILD_RUNTIME_NNAPI_TEST as ON # if CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.2 diff --git a/cmake/options/options_aarch64-linux.cmake b/cmake/options/options_aarch64-linux.cmake index caabe48ef..c5e3995d1 100644 --- a/cmake/options/options_aarch64-linux.cmake +++ b/cmake/options/options_aarch64-linux.cmake @@ -1,7 +1,6 @@ # # aarch64 linux cmake options # -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) option(BUILD_ANDROID_TFLITE "Enable android support for TensorFlow Lite" OFF) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) diff --git a/cmake/options/options_aarch64-tizen.cmake b/cmake/options/options_aarch64-tizen.cmake index e285c6d9e..41228480f 100644 --- a/cmake/options/options_aarch64-tizen.cmake +++ b/cmake/options/options_aarch64-tizen.cmake @@ -1,7 +1,6 @@ # # aarch64 tizen cmake options # -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) option(BUILD_ANDROID_TFLITE "Enable android support for TensorFlow Lite" OFF) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) diff --git a/cmake/options/options_arm64-android.cmake b/cmake/options/options_arm64-android.cmake index 431970c7c..486b3bb96 100644 --- a/cmake/options/options_arm64-android.cmake +++ b/cmake/options/options_arm64-android.cmake @@ -1,6 +1,5 @@ # arm64 android cmake options # -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) option(BUILD_ANDROID_TFLITE "Enable android support for TensorFlow Lite" ON) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) diff --git a/cmake/options/options_armv7l-linux.cmake b/cmake/options/options_armv7l-linux.cmake index 2e2c9898a..5c62933cb 100644 --- a/cmake/options/options_armv7l-linux.cmake +++ b/cmake/options/options_armv7l-linux.cmake @@ -1,7 +1,6 @@ # # armv7l linux cmake options # -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) option(BUILD_ANDROID_TFLITE "Enable android support for TensorFlow Lite" OFF) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) diff --git a/cmake/options/options_armv7l-tizen.cmake b/cmake/options/options_armv7l-tizen.cmake index defdfba44..687c52375 100644 --- a/cmake/options/options_armv7l-tizen.cmake +++ b/cmake/options/options_armv7l-tizen.cmake @@ -1,7 +1,6 @@ # # armv7l tizen cmake options # -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" ON) option(BUILD_ANDROID_TFLITE "Enable android support for TensorFlow Lite" OFF) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" ON) diff --git a/cmake/options/options_x86_64-linux.cmake b/cmake/options/options_x86_64-linux.cmake index 7812857af..179e5bdb2 100644 --- a/cmake/options/options_x86_64-linux.cmake +++ b/cmake/options/options_x86_64-linux.cmake @@ -1,7 +1,6 @@ # # x86_64 linux cmake options # -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" OFF) option(BUILD_ARMCOMPUTE "Build ARM Compute from the downloaded source" OFF) option(BUILD_ANDROID_TFLITE "Enable android support for TensorFlow Lite" OFF) option(DOWNLOAD_ARMCOMPUTE "Download ARM Compute source" OFF) diff --git a/packaging/nnfw.spec b/packaging/nnfw.spec index f1670f333..6508d7907 100644 --- a/packaging/nnfw.spec +++ b/packaging/nnfw.spec @@ -48,9 +48,9 @@ NNFW test rpm. It does not depends on nnfw rpm since it contains nnfw runtime. %{!?coverage_build: %define coverage_build 0} %if %{coverage_build} == 1 -%define build_options OPTIONS='-DBUILD_NEURUN=on -DBUILD_PURE_ARM_COMPUTE=off' COVERAGE_BUILD=1 OBS_BUILD=1 BUILD_TYPE=Debug TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=9 +%define build_options COVERAGE_BUILD=1 OBS_BUILD=1 BUILD_TYPE=Debug TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=9 %else -%define build_options OPTIONS='-DBUILD_NEURUN=on -DBUILD_PURE_ARM_COMPUTE=off' OBS_BUILD=1 BUILD_TYPE=%{build_type} INSTALL_PATH=%{buildroot}%{_prefix} TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=9 +%define build_options OBS_BUILD=1 BUILD_TYPE=%{build_type} INSTALL_PATH=%{buildroot}%{_prefix} TARGET_ARCH=%{target_arch} TARGET_OS=tizen TFLITE_MAJOR_VER=1 TFLITE_MINOR_VER=9 %endif %prep diff --git a/runtimes/neurun/backend/acl_cl/CMakeLists.txt b/runtimes/neurun/backend/acl_cl/CMakeLists.txt index c9a7d51f6..4489643d2 100644 --- a/runtimes/neurun/backend/acl_cl/CMakeLists.txt +++ b/runtimes/neurun/backend/acl_cl/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} ${LIB_NEURUN_BACKEND_ACL_COMM target_compile_options(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE -Wall -Wextra -Werror) set_target_properties(${LIB_NEURUN_BACKEND_ACL_CL} PROPERTIES OUTPUT_NAME backend_acl_cl) -install(TARGETS ${LIB_NEURUN_BACKEND_ACL_CL} DESTINATION lib/neurun) +install(TARGETS ${LIB_NEURUN_BACKEND_ACL_CL} DESTINATION lib) diff --git a/runtimes/neurun/backend/acl_common/CMakeLists.txt b/runtimes/neurun/backend/acl_common/CMakeLists.txt index 845ca9d8c..36869606e 100644 --- a/runtimes/neurun/backend/acl_common/CMakeLists.txt +++ b/runtimes/neurun/backend/acl_common/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(${LIB_NEURUN_BACKEND_ACL_COMMON} nnfw_lib_misc) set_target_properties(${LIB_NEURUN_BACKEND_ACL_COMMON} PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(${LIB_NEURUN_BACKEND_ACL_COMMON} PROPERTIES OUTPUT_NAME backend_acl_common) -install(TARGETS ${LIB_NEURUN_BACKEND_ACL_COMMON} DESTINATION lib/neurun) +install(TARGETS ${LIB_NEURUN_BACKEND_ACL_COMMON} DESTINATION lib) diff --git a/runtimes/neurun/backend/acl_neon/CMakeLists.txt b/runtimes/neurun/backend/acl_neon/CMakeLists.txt index 5d33ea1d5..850b7c0e7 100644 --- a/runtimes/neurun/backend/acl_neon/CMakeLists.txt +++ b/runtimes/neurun/backend/acl_neon/CMakeLists.txt @@ -29,4 +29,4 @@ target_link_libraries(${LIB_NEURUN_BACKEND_ACL_NEON} ${LIB_NEURUN_BACKEND_ACL_CO target_compile_options(${LIB_NEURUN_BACKEND_ACL_NEON} PRIVATE -Wall -Wextra -Werror) set_target_properties(${LIB_NEURUN_BACKEND_ACL_NEON} PROPERTIES OUTPUT_NAME backend_acl_neon) -install(TARGETS ${LIB_NEURUN_BACKEND_ACL_NEON} DESTINATION lib/neurun) +install(TARGETS ${LIB_NEURUN_BACKEND_ACL_NEON} DESTINATION lib) diff --git a/runtimes/neurun/backend/cpu/CMakeLists.txt b/runtimes/neurun/backend/cpu/CMakeLists.txt index b03b9274c..9b25f64df 100644 --- a/runtimes/neurun/backend/cpu/CMakeLists.txt +++ b/runtimes/neurun/backend/cpu/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(${LIB_NEURUN_BACKEND_CPU} neurun-core) target_compile_options(${LIB_NEURUN_BACKEND_CPU} PRIVATE -Wall -Wextra -Werror) set_target_properties(${LIB_NEURUN_BACKEND_CPU} PROPERTIES OUTPUT_NAME backend_cpu) -install(TARGETS ${LIB_NEURUN_BACKEND_CPU} DESTINATION lib/neurun) +install(TARGETS ${LIB_NEURUN_BACKEND_CPU} DESTINATION lib) # Unit Tests set(TEST_NEURUN_BACKEND_CPU test_neurun_backend_cpu) diff --git a/runtimes/neurun/frontend/nnapi/CMakeLists.txt b/runtimes/neurun/frontend/nnapi/CMakeLists.txt index 001fa726d..fac3d8dca 100644 --- a/runtimes/neurun/frontend/nnapi/CMakeLists.txt +++ b/runtimes/neurun/frontend/nnapi/CMakeLists.txt @@ -9,5 +9,5 @@ target_compile_options(${LIB_NEURUN} PRIVATE -Wall -Wextra -Werror) set_target_properties(${LIB_NEURUN} PROPERTIES OUTPUT_NAME neuralnetworks) -install(TARGETS ${LIB_NEURUN} DESTINATION lib/neurun) +install(TARGETS ${LIB_NEURUN} DESTINATION lib) diff --git a/runtimes/pure_arm_compute/CMakeLists.txt b/runtimes/pure_arm_compute/CMakeLists.txt index 9645e09a0..b45db661a 100644 --- a/runtimes/pure_arm_compute/CMakeLists.txt +++ b/runtimes/pure_arm_compute/CMakeLists.txt @@ -23,7 +23,6 @@ endif() set_target_properties(nnapi_pure_arm_compute PROPERTIES OUTPUT_NAME neuralnetworks) install(TARGETS nnapi_pure_arm_compute DESTINATION lib/pureacl RENAME neuralnetworks) -install(TARGETS nnapi_pure_arm_compute DESTINATION lib RENAME neuralnetworks) # To prevent undefined references add_executable(pure_arm_compute_symbolcheck symbolcheck.cpp) 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 diff --git a/tests/framework/tests/MODELS/mobilenet/config.sh b/tests/framework/tests/MODELS/mobilenet/config.sh index b17a3bd54..b23d687cd 100644 --- a/tests/framework/tests/MODELS/mobilenet/config.sh +++ b/tests/framework/tests/MODELS/mobilenet/config.sh @@ -1,3 +1,2 @@ MODELFILE_SERVER_PATH="https://storage.googleapis.com/download.tensorflow.org/models/tflite" MODELFILE_NAME="mobilenet_v1_0.25_128_float_2017_11_08.zip" -STATUS="enabled" diff --git a/tests/framework/tests/concat/2D/config.sh b/tests/framework/tests/concat/2D/config.sh index bb71cad83..fd22e708c 100644 --- a/tests/framework/tests/concat/2D/config.sh +++ b/tests/framework/tests/concat/2D/config.sh @@ -1,2 +1 @@ MODELFILE_NAME="concat_test_2d.tflite" -STATUS="disabled" diff --git a/tests/framework/tests/exp/config.sh b/tests/framework/tests/exp/config.sh index 47f878783..944f0bbce 100644 --- a/tests/framework/tests/exp/config.sh +++ b/tests/framework/tests/exp/config.sh @@ -1,2 +1 @@ MODELFILE_NAME="exp_4d.tflite" -STATUS="enabled" diff --git a/tests/framework/tests/logistic/config.sh b/tests/framework/tests/logistic/config.sh index 456773aa9..632c3629e 100644 --- a/tests/framework/tests/logistic/config.sh +++ b/tests/framework/tests/logistic/config.sh @@ -1 +1,2 @@ MODELFILE_NAME="sigmoid_test.tflite" +STATUS="disabled" diff --git a/tests/framework/tests/neg/config.sh b/tests/framework/tests/neg/config.sh index 8cde1a258..000f7c811 100644 --- a/tests/framework/tests/neg/config.sh +++ b/tests/framework/tests/neg/config.sh @@ -1,2 +1 @@ MODELFILE_NAME="neg_4d.tflite" -STATUS="enabled" diff --git a/tests/framework/tests/pad/4D_2D/config.sh b/tests/framework/tests/pad/4D_2D/config.sh index 9e0de2244..a201c861a 100644 --- a/tests/framework/tests/pad/4D_2D/config.sh +++ b/tests/framework/tests/pad/4D_2D/config.sh @@ -1 +1,2 @@ MODELFILE_NAME="pad_4d_2d_test.tflite" +STATUS="disabled" diff --git a/tests/framework/tests/reduce_max/config.sh b/tests/framework/tests/reduce_max/config.sh index 255cd7b3d..d636b8bd3 100644 --- a/tests/framework/tests/reduce_max/config.sh +++ b/tests/framework/tests/reduce_max/config.sh @@ -1,3 +1 @@ -# REDUCE_MAX is supported after tensorflow 1.10 MODELFILE_NAME="reduce_max_1d.tflite" -STATUS="disabled" diff --git a/tests/framework/tests/reduce_mean/test1/config.sh b/tests/framework/tests/reduce_mean/test1/config.sh index 7884000aa..2f370ea4e 100644 --- a/tests/framework/tests/reduce_mean/test1/config.sh +++ b/tests/framework/tests/reduce_mean/test1/config.sh @@ -1,3 +1 @@ -# REDUCE_MEAN is supported after tensorflow 1.10 MODELFILE_NAME="reduce_mean_test.tflite" -STATUS="disabled" diff --git a/tests/framework/tests/reduce_mean/test2/config.sh b/tests/framework/tests/reduce_mean/test2/config.sh index d9ca89a7a..6c54779a9 100644 --- a/tests/framework/tests/reduce_mean/test2/config.sh +++ b/tests/framework/tests/reduce_mean/test2/config.sh @@ -1,3 +1 @@ -# REDUCE_MEAN is supported after tensorflow 1.10 MODELFILE_NAME="reduce_mean_test_2.tflite" -STATUS="disabled" diff --git a/tests/framework/tests/rsqrt/config.sh b/tests/framework/tests/rsqrt/config.sh index c97f8af6e..87aa85277 100644 --- a/tests/framework/tests/rsqrt/config.sh +++ b/tests/framework/tests/rsqrt/config.sh @@ -1,2 +1 @@ MODELFILE_NAME="rsqrt_4d.tflite" -STATUS="disabled" diff --git a/tests/nnapi/CMakeLists.txt b/tests/nnapi/CMakeLists.txt index 79af05bdb..cb09602cb 100644 --- a/tests/nnapi/CMakeLists.txt +++ b/tests/nnapi/CMakeLists.txt @@ -41,9 +41,9 @@ set(RUNTIME_NNAPI_TEST_SRC_INC ${CMAKE_CURRENT_SOURCE_DIR}/include target_include_directories(${RUNTIME_NNAPI_TEST} PRIVATE ${RUNTIME_NNAPI_TEST_SRC_INC}) if (BUILD_NEURUN) - set(SKIPLIST_FILE_NAME ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}.neurun) -elseif (BUILD_PURE_ARM_COMPUTE) set(SKIPLIST_FILE_NAME ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}) +elseif (BUILD_PURE_ARM_COMPUTE) + set(SKIPLIST_FILE_NAME ${RUNTIME_NNAPI_TEST}.skip.${TARGET_PLATFORM}.pacl) endif() target_link_libraries(${RUNTIME_NNAPI_TEST} nnapi-header) target_link_libraries(${RUNTIME_NNAPI_TEST} gtest) diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux b/tests/nnapi/nnapi_gtest.skip.armv7l-linux index 27a18d35d..27bcab456 100644 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux @@ -1,38 +1,19 @@ -GeneratedTests.greater_equal_ex* -GeneratedTests.less_ex* -GeneratedTests.lsh_projection -GeneratedTests.lsh_projection_2 -GeneratedTests.lsh_projection_weights_as_inputs -GeneratedTests.lstm -GeneratedTests.lstm2 -GeneratedTests.lstm2_state -GeneratedTests.lstm2_state2 -GeneratedTests.lstm3 -GeneratedTests.lstm3_state -GeneratedTests.lstm3_state2 -GeneratedTests.lstm3_state3 -GeneratedTests.lstm_state -GeneratedTests.lstm_state2 -GeneratedTests.pack* -GeneratedTests.svdf -GeneratedTests.svdf2 -GeneratedTests.svdf_state -ValidationTestCompilation.CreateExecution -ValidationTestCompilation.Finish -ValidationTestCompilation.SetPreference -ValidationTestExecution.EventWait -ValidationTestExecution.SetInput -ValidationTestExecution.SetInputFromMemory -ValidationTestExecution.SetOutput -ValidationTestExecution.SetOutputFromMemory +# +# Following tests will be skipped on armv7l-linux +# +# Not support operations ValidationTestExecution.StartCompute -ValidationTestIdentify.DuplicateInputs -ValidationTestIdentify.DuplicateOutputs -ValidationTestIdentify.InputIsOutput -ValidationTestIdentify.OutputIsInput -ValidationTestModel.AddOperand -ValidationTestModel.CreateCompilation -ValidationTestModel.Finish -ValidationTestModel.IdentifyInputsAndOutputs -ValidationTestModel.SetOperandValue -ValidationTestModel.SetOperandValueFromMemory +GeneratedTests.lsh_projection* +GeneratedTests.lstm* +GeneratedTests.mobilenet* +GeneratedTests.rnn* +GeneratedTests.pad* +GeneratedTests.svdf* +GeneratedTests.batch_to_space* +GeneratedTests.space_to_batch* +# Unexpected result +GeneratedTests.split* +GeneratedTests.pack* +GeneratedTests.unpack* +# Not support broadcast +GeneratedTests.logical_or_ex_broadcast_4D_2D diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon new file mode 100644 index 000000000..c6f7249e5 --- /dev/null +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon @@ -0,0 +1,88 @@ +# +# Following tests will be skipped on armv7l-linux acl_neon +# +# Not support operations +TrivialTest.AddTwo +TrivialTest.AddThree +TrivialTest.BroadcastAddTwo +TrivialTest.BroadcastMulTwo +ValidationTestCompilation.SetPreference +ValidationTestCompilation.CreateExecution +ValidationTestCompilation.Finish +ValidationTestExecution.SetInput +ValidationTestExecution.SetOutput +ValidationTestExecution.SetInputFromMemory +ValidationTestExecution.SetOutputFromMemory +ValidationTestExecution.StartCompute +ValidationTestExecution.EventWait +GeneratedTests.add* +GeneratedTests.argmax* +GeneratedTests.depth_to_space* +GeneratedTests.depthwise_conv2d_quant* +GeneratedTests.depthwise_conv +GeneratedTests.dequantize +GeneratedTests.embedding_lookup +GeneratedTests.embedding_lookup_2d_nnfw +GeneratedTests.embedding_lookup_4d_nnfw +GeneratedTests.equal_ex* +GeneratedTests.exp_ex* +GeneratedTests.floor_ +GeneratedTests.greater_equal_ex* +GeneratedTests.hashtable_lookup* +GeneratedTests.l2_normalization* +GeneratedTests.l2_pool* +GeneratedTests.local_response_norm* +GeneratedTests.less_ex* +GeneratedTests.logical_and_ex* +GeneratedTests.logical_or_ex* +GeneratedTests.logistic* +GeneratedTests.lsh_projection* +GeneratedTests.lstm* +GeneratedTests.mobilenet* +GeneratedTests.mul* +GeneratedTests.neg* +GeneratedTests.notequal* +GeneratedTests.prelu_ex* +GeneratedTests.reduce_min* +GeneratedTests.relu1* +GeneratedTests.relu6* +GeneratedTests.relu* +GeneratedTests.resize_bilinear* +GeneratedTests.rnn* +GeneratedTests.rsqrt* +GeneratedTests.mean* +GeneratedTests.pad* +GeneratedTests.space_to_depth* +GeneratedTests.sqrt_ex* +GeneratedTests.squared_difference_ex* +GeneratedTests.svdf* +GeneratedTests.tanh_ +GeneratedTests.batch_to_space* +GeneratedTests.div_* +GeneratedTests.space_to_batch* +GeneratedTests.squeeze* +GeneratedTests.strided_slice* +GeneratedTests.sub* +GeneratedTests.transpose* +GeneratedTests.cast_ex* +GeneratedTests.gather_ex* +GeneratedTests.strided_slice_ex* +GeneratedTests.reduce_max_ex* +GeneratedTests.reduce_sum_ex* +GeneratedTests.topk_v2* +# Unexpected result +GeneratedTests.split* +GeneratedTests.transpose_conv* +GeneratedTests.pack* +GeneratedTests.unpack* +generatedtests.logical_not_ex* +# Need to be fixed +GeneratedTests.fully_connected_float_1_nnfw +GeneratedTests.fully_connected_quant8_2 +GeneratedTests.reshape +GeneratedTests.reshape_quant8 +GeneratedTests.reshape_quant8_weights_as_inputs +GeneratedTests.reshape_weights_as_inputs +GeneratedTests.fully_connected_float_4d_simple +GeneratedTests.logical_not_ex_1D +GeneratedTests.logical_not_ex_4D diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu new file mode 100644 index 000000000..630e98ab6 --- /dev/null +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu @@ -0,0 +1,78 @@ +# +# Following tests will be skipped on armv7l-linux +# +# Not support operations +TrivialTest.AddTwo +TrivialTest.AddThree +TrivialTest.BroadcastAddTwo +TrivialTest.BroadcastMulTwo +ValidationTestCompilation.SetPreference +ValidationTestCompilation.CreateExecution +ValidationTestCompilation.Finish +ValidationTestExecution.SetInput +ValidationTestExecution.SetOutput +ValidationTestExecution.SetInputFromMemory +ValidationTestExecution.SetOutputFromMemory +ValidationTestExecution.StartCompute +ValidationTestExecution.EventWait +GeneratedTests.add* +GeneratedTests.argmax* +GeneratedTests.depth_to_space* +GeneratedTests.depthwise_conv2d_quant* +GeneratedTests.depthwise_conv +GeneratedTests.dequantize +GeneratedTests.embedding_lookup +GeneratedTests.embedding_lookup_2d_nnfw +GeneratedTests.embedding_lookup_4d_nnfw +GeneratedTests.equal_ex* +GeneratedTests.exp_ex* +GeneratedTests.floor_ +GeneratedTests.greater_equal_ex* +GeneratedTests.hashtable_lookup* +GeneratedTests.l2_normalization* +GeneratedTests.l2_pool* +GeneratedTests.local_response_norm* +GeneratedTests.less_ex* +GeneratedTests.logical_and_ex* +GeneratedTests.logical_or_ex* +GeneratedTests.logistic* +GeneratedTests.lsh_projection* +GeneratedTests.lstm* +GeneratedTests.mobilenet* +GeneratedTests.mul* +GeneratedTests.neg* +GeneratedTests.notequal* +GeneratedTests.prelu_ex* +GeneratedTests.reduce_min* +GeneratedTests.relu1* +GeneratedTests.relu6* +GeneratedTests.relu* +GeneratedTests.resize_bilinear* +GeneratedTests.rnn* +GeneratedTests.rsqrt* +GeneratedTests.mean* +GeneratedTests.pad* +GeneratedTests.space_to_depth* +GeneratedTests.sqrt_ex* +GeneratedTests.squared_difference_ex* +GeneratedTests.svdf* +GeneratedTests.tanh_ +GeneratedTests.batch_to_space* +GeneratedTests.div_* +GeneratedTests.space_to_batch* +GeneratedTests.squeeze* +GeneratedTests.strided_slice* +GeneratedTests.sub* +GeneratedTests.transpose* +GeneratedTests.cast_ex* +GeneratedTests.gather_ex* +GeneratedTests.strided_slice_ex* +GeneratedTests.reduce_max_ex* +GeneratedTests.reduce_sum_ex* +GeneratedTests.topk_v2* +# Unexpected result +GeneratedTests.split* +GeneratedTests.transpose_conv* +GeneratedTests.pack* +GeneratedTests.unpack* +GeneratedTests.logical_not_ex* diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun deleted file mode 100644 index 27bcab456..000000000 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun +++ /dev/null @@ -1,19 +0,0 @@ -# -# Following tests will be skipped on armv7l-linux -# -# Not support operations -ValidationTestExecution.StartCompute -GeneratedTests.lsh_projection* -GeneratedTests.lstm* -GeneratedTests.mobilenet* -GeneratedTests.rnn* -GeneratedTests.pad* -GeneratedTests.svdf* -GeneratedTests.batch_to_space* -GeneratedTests.space_to_batch* -# Unexpected result -GeneratedTests.split* -GeneratedTests.pack* -GeneratedTests.unpack* -# Not support broadcast -GeneratedTests.logical_or_ex_broadcast_4D_2D diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon deleted file mode 100644 index c6f7249e5..000000000 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon +++ /dev/null @@ -1,88 +0,0 @@ -# -# Following tests will be skipped on armv7l-linux acl_neon -# -# Not support operations -TrivialTest.AddTwo -TrivialTest.AddThree -TrivialTest.BroadcastAddTwo -TrivialTest.BroadcastMulTwo -ValidationTestCompilation.SetPreference -ValidationTestCompilation.CreateExecution -ValidationTestCompilation.Finish -ValidationTestExecution.SetInput -ValidationTestExecution.SetOutput -ValidationTestExecution.SetInputFromMemory -ValidationTestExecution.SetOutputFromMemory -ValidationTestExecution.StartCompute -ValidationTestExecution.EventWait -GeneratedTests.add* -GeneratedTests.argmax* -GeneratedTests.depth_to_space* -GeneratedTests.depthwise_conv2d_quant* -GeneratedTests.depthwise_conv -GeneratedTests.dequantize -GeneratedTests.embedding_lookup -GeneratedTests.embedding_lookup_2d_nnfw -GeneratedTests.embedding_lookup_4d_nnfw -GeneratedTests.equal_ex* -GeneratedTests.exp_ex* -GeneratedTests.floor_ -GeneratedTests.greater_equal_ex* -GeneratedTests.hashtable_lookup* -GeneratedTests.l2_normalization* -GeneratedTests.l2_pool* -GeneratedTests.local_response_norm* -GeneratedTests.less_ex* -GeneratedTests.logical_and_ex* -GeneratedTests.logical_or_ex* -GeneratedTests.logistic* -GeneratedTests.lsh_projection* -GeneratedTests.lstm* -GeneratedTests.mobilenet* -GeneratedTests.mul* -GeneratedTests.neg* -GeneratedTests.notequal* -GeneratedTests.prelu_ex* -GeneratedTests.reduce_min* -GeneratedTests.relu1* -GeneratedTests.relu6* -GeneratedTests.relu* -GeneratedTests.resize_bilinear* -GeneratedTests.rnn* -GeneratedTests.rsqrt* -GeneratedTests.mean* -GeneratedTests.pad* -GeneratedTests.space_to_depth* -GeneratedTests.sqrt_ex* -GeneratedTests.squared_difference_ex* -GeneratedTests.svdf* -GeneratedTests.tanh_ -GeneratedTests.batch_to_space* -GeneratedTests.div_* -GeneratedTests.space_to_batch* -GeneratedTests.squeeze* -GeneratedTests.strided_slice* -GeneratedTests.sub* -GeneratedTests.transpose* -GeneratedTests.cast_ex* -GeneratedTests.gather_ex* -GeneratedTests.strided_slice_ex* -GeneratedTests.reduce_max_ex* -GeneratedTests.reduce_sum_ex* -GeneratedTests.topk_v2* -# Unexpected result -GeneratedTests.split* -GeneratedTests.transpose_conv* -GeneratedTests.pack* -GeneratedTests.unpack* -generatedtests.logical_not_ex* -# Need to be fixed -GeneratedTests.fully_connected_float_1_nnfw -GeneratedTests.fully_connected_quant8_2 -GeneratedTests.reshape -GeneratedTests.reshape_quant8 -GeneratedTests.reshape_quant8_weights_as_inputs -GeneratedTests.reshape_weights_as_inputs -GeneratedTests.fully_connected_float_4d_simple -GeneratedTests.logical_not_ex_1D -GeneratedTests.logical_not_ex_4D diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu deleted file mode 100644 index 630e98ab6..000000000 --- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu +++ /dev/null @@ -1,78 +0,0 @@ -# -# Following tests will be skipped on armv7l-linux -# -# Not support operations -TrivialTest.AddTwo -TrivialTest.AddThree -TrivialTest.BroadcastAddTwo -TrivialTest.BroadcastMulTwo -ValidationTestCompilation.SetPreference -ValidationTestCompilation.CreateExecution -ValidationTestCompilation.Finish -ValidationTestExecution.SetInput -ValidationTestExecution.SetOutput -ValidationTestExecution.SetInputFromMemory -ValidationTestExecution.SetOutputFromMemory -ValidationTestExecution.StartCompute -ValidationTestExecution.EventWait -GeneratedTests.add* -GeneratedTests.argmax* -GeneratedTests.depth_to_space* -GeneratedTests.depthwise_conv2d_quant* -GeneratedTests.depthwise_conv -GeneratedTests.dequantize -GeneratedTests.embedding_lookup -GeneratedTests.embedding_lookup_2d_nnfw -GeneratedTests.embedding_lookup_4d_nnfw -GeneratedTests.equal_ex* -GeneratedTests.exp_ex* -GeneratedTests.floor_ -GeneratedTests.greater_equal_ex* -GeneratedTests.hashtable_lookup* -GeneratedTests.l2_normalization* -GeneratedTests.l2_pool* -GeneratedTests.local_response_norm* -GeneratedTests.less_ex* -GeneratedTests.logical_and_ex* -GeneratedTests.logical_or_ex* -GeneratedTests.logistic* -GeneratedTests.lsh_projection* -GeneratedTests.lstm* -GeneratedTests.mobilenet* -GeneratedTests.mul* -GeneratedTests.neg* -GeneratedTests.notequal* -GeneratedTests.prelu_ex* -GeneratedTests.reduce_min* -GeneratedTests.relu1* -GeneratedTests.relu6* -GeneratedTests.relu* -GeneratedTests.resize_bilinear* -GeneratedTests.rnn* -GeneratedTests.rsqrt* -GeneratedTests.mean* -GeneratedTests.pad* -GeneratedTests.space_to_depth* -GeneratedTests.sqrt_ex* -GeneratedTests.squared_difference_ex* -GeneratedTests.svdf* -GeneratedTests.tanh_ -GeneratedTests.batch_to_space* -GeneratedTests.div_* -GeneratedTests.space_to_batch* -GeneratedTests.squeeze* -GeneratedTests.strided_slice* -GeneratedTests.sub* -GeneratedTests.transpose* -GeneratedTests.cast_ex* -GeneratedTests.gather_ex* -GeneratedTests.strided_slice_ex* -GeneratedTests.reduce_max_ex* -GeneratedTests.reduce_sum_ex* -GeneratedTests.topk_v2* -# Unexpected result -GeneratedTests.split* -GeneratedTests.transpose_conv* -GeneratedTests.pack* -GeneratedTests.unpack* -GeneratedTests.logical_not_ex* diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.pacl b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.pacl new file mode 100644 index 000000000..27a18d35d --- /dev/null +++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.pacl @@ -0,0 +1,38 @@ +GeneratedTests.greater_equal_ex* +GeneratedTests.less_ex* +GeneratedTests.lsh_projection +GeneratedTests.lsh_projection_2 +GeneratedTests.lsh_projection_weights_as_inputs +GeneratedTests.lstm +GeneratedTests.lstm2 +GeneratedTests.lstm2_state +GeneratedTests.lstm2_state2 +GeneratedTests.lstm3 +GeneratedTests.lstm3_state +GeneratedTests.lstm3_state2 +GeneratedTests.lstm3_state3 +GeneratedTests.lstm_state +GeneratedTests.lstm_state2 +GeneratedTests.pack* +GeneratedTests.svdf +GeneratedTests.svdf2 +GeneratedTests.svdf_state +ValidationTestCompilation.CreateExecution +ValidationTestCompilation.Finish +ValidationTestCompilation.SetPreference +ValidationTestExecution.EventWait +ValidationTestExecution.SetInput +ValidationTestExecution.SetInputFromMemory +ValidationTestExecution.SetOutput +ValidationTestExecution.SetOutputFromMemory +ValidationTestExecution.StartCompute +ValidationTestIdentify.DuplicateInputs +ValidationTestIdentify.DuplicateOutputs +ValidationTestIdentify.InputIsOutput +ValidationTestIdentify.OutputIsInput +ValidationTestModel.AddOperand +ValidationTestModel.CreateCompilation +ValidationTestModel.Finish +ValidationTestModel.IdentifyInputsAndOutputs +ValidationTestModel.SetOperandValue +ValidationTestModel.SetOperandValueFromMemory diff --git a/tests/nnapi/nnapi_gtest.skip.x86_64-linux b/tests/nnapi/nnapi_gtest.skip.x86_64-linux new file mode 100644 index 000000000..dca5dc763 --- /dev/null +++ b/tests/nnapi/nnapi_gtest.skip.x86_64-linux @@ -0,0 +1,114 @@ +# +# Following tests will be skipped on x86_64-linux +# +# Not support operations +TrivialTest.AddTwo +TrivialTest.AddThree +TrivialTest.BroadcastAddTwo +TrivialTest.BroadcastMulTwo +ValidationTestCompilation.SetPreference +ValidationTestCompilation.CreateExecution +ValidationTestCompilation.Finish +ValidationTestExecution.SetInput +ValidationTestExecution.SetOutput +ValidationTestExecution.SetInputFromMemory +ValidationTestExecution.SetOutputFromMemory +ValidationTestExecution.StartCompute +ValidationTestExecution.EventWait +GeneratedTests.add* +GeneratedTests.argmax* +GeneratedTests.avg_pool_float_1 +GeneratedTests.avg_pool_float_2 +GeneratedTests.avg_pool_float_3 +GeneratedTests.avg_pool_float_4 +GeneratedTests.avg_pool_quant8_1 +GeneratedTests.avg_pool_quant8_2 +GeneratedTests.avg_pool_quant8_3 +GeneratedTests.avg_pool_quant8_4 +GeneratedTests.conv_float_channels +GeneratedTests.conv_float_channels_weights_as_inputs +GeneratedTests.conv_float_large +GeneratedTests.conv_float_large_weights_as_inputs +GeneratedTests.conv_float +GeneratedTests.conv_float_weights_as_inputs +GeneratedTests.conv_quant8_channels +GeneratedTests.conv_quant8_channels_weights_as_inputs +GeneratedTests.conv_quant8_large +GeneratedTests.conv_quant8_large_weights_as_inputs +GeneratedTests.conv_quant8 +GeneratedTests.conv_quant8_overflow +GeneratedTests.conv_quant8_overflow_weights_as_inputs +GeneratedTests.conv_quant8_weights_as_inputs +GeneratedTests.depth_to_space* +GeneratedTests.depthwise_conv2d* +GeneratedTests.depthwise_conv +GeneratedTests.dequantize +GeneratedTests.embedding_lookup +GeneratedTests.embedding_lookup_2d_nnfw +GeneratedTests.embedding_lookup_4d_nnfw +GeneratedTests.equal_ex* +GeneratedTests.exp_ex* +GeneratedTests.floor_ +GeneratedTests.greater_equal_ex* +GeneratedTests.hashtable_lookup* +GeneratedTests.l2_normalization* +GeneratedTests.l2_pool* +GeneratedTests.less* +GeneratedTests.local_response_norm* +GeneratedTests.logical_and_ex* +GeneratedTests.logical_or_ex* +GeneratedTests.logistic* +GeneratedTests.lsh_projection* +GeneratedTests.lstm* +GeneratedTests.max_pool_float_1 +GeneratedTests.max_pool_float_2 +GeneratedTests.max_pool_float_3 +GeneratedTests.max_pool_quant8_1 +GeneratedTests.max_pool_quant8_2 +GeneratedTests.max_pool_quant8_3 +GeneratedTests.mobilenet* +GeneratedTests.mul* +GeneratedTests.neg* +GeneratedTests.notequal* +GeneratedTests.prelu_ex* +GeneratedTests.reduce_min* +GeneratedTests.relu1* +GeneratedTests.relu6* +GeneratedTests.relu* +GeneratedTests.resize_bilinear* +GeneratedTests.rnn* +GeneratedTests.rsqrt* +GeneratedTests.mean* +GeneratedTests.pad* +GeneratedTests.space_to_depth* +GeneratedTests.sqrt_ex* +GeneratedTests.squared_difference_ex* +GeneratedTests.svdf* +GeneratedTests.tanh_ +GeneratedTests.batch_to_space* +GeneratedTests.div_* +GeneratedTests.space_to_batch* +GeneratedTests.squeeze* +GeneratedTests.strided_slice* +GeneratedTests.sub* +GeneratedTests.transpose* +GeneratedTests.cast_ex* +GeneratedTests.gather_ex* +GeneratedTests.strided_slice_ex* +GeneratedTests.reduce_max_ex* +GeneratedTests.reduce_sum_ex* +GeneratedTests.topk_v2* +# Unhandled exception +GeneratedTests.concat* +GeneratedTests.fully_connected* +GeneratedTests.reshape* +# Unexpected result +GeneratedTests.avg_pool_quant8_5 +GeneratedTests.conv_quant8_2 +GeneratedTests.max_pool_quant8_4 +GeneratedTests.softmax* +GeneratedTests.split* +GeneratedTests.transpose_conv* +GeneratedTests.pack* +GeneratedTests.unpack* +GeneratedTests.logical_not_ex* diff --git a/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun b/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun deleted file mode 100644 index dca5dc763..000000000 --- a/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun +++ /dev/null @@ -1,114 +0,0 @@ -# -# Following tests will be skipped on x86_64-linux -# -# Not support operations -TrivialTest.AddTwo -TrivialTest.AddThree -TrivialTest.BroadcastAddTwo -TrivialTest.BroadcastMulTwo -ValidationTestCompilation.SetPreference -ValidationTestCompilation.CreateExecution -ValidationTestCompilation.Finish -ValidationTestExecution.SetInput -ValidationTestExecution.SetOutput -ValidationTestExecution.SetInputFromMemory -ValidationTestExecution.SetOutputFromMemory -ValidationTestExecution.StartCompute -ValidationTestExecution.EventWait -GeneratedTests.add* -GeneratedTests.argmax* -GeneratedTests.avg_pool_float_1 -GeneratedTests.avg_pool_float_2 -GeneratedTests.avg_pool_float_3 -GeneratedTests.avg_pool_float_4 -GeneratedTests.avg_pool_quant8_1 -GeneratedTests.avg_pool_quant8_2 -GeneratedTests.avg_pool_quant8_3 -GeneratedTests.avg_pool_quant8_4 -GeneratedTests.conv_float_channels -GeneratedTests.conv_float_channels_weights_as_inputs -GeneratedTests.conv_float_large -GeneratedTests.conv_float_large_weights_as_inputs -GeneratedTests.conv_float -GeneratedTests.conv_float_weights_as_inputs -GeneratedTests.conv_quant8_channels -GeneratedTests.conv_quant8_channels_weights_as_inputs -GeneratedTests.conv_quant8_large -GeneratedTests.conv_quant8_large_weights_as_inputs -GeneratedTests.conv_quant8 -GeneratedTests.conv_quant8_overflow -GeneratedTests.conv_quant8_overflow_weights_as_inputs -GeneratedTests.conv_quant8_weights_as_inputs -GeneratedTests.depth_to_space* -GeneratedTests.depthwise_conv2d* -GeneratedTests.depthwise_conv -GeneratedTests.dequantize -GeneratedTests.embedding_lookup -GeneratedTests.embedding_lookup_2d_nnfw -GeneratedTests.embedding_lookup_4d_nnfw -GeneratedTests.equal_ex* -GeneratedTests.exp_ex* -GeneratedTests.floor_ -GeneratedTests.greater_equal_ex* -GeneratedTests.hashtable_lookup* -GeneratedTests.l2_normalization* -GeneratedTests.l2_pool* -GeneratedTests.less* -GeneratedTests.local_response_norm* -GeneratedTests.logical_and_ex* -GeneratedTests.logical_or_ex* -GeneratedTests.logistic* -GeneratedTests.lsh_projection* -GeneratedTests.lstm* -GeneratedTests.max_pool_float_1 -GeneratedTests.max_pool_float_2 -GeneratedTests.max_pool_float_3 -GeneratedTests.max_pool_quant8_1 -GeneratedTests.max_pool_quant8_2 -GeneratedTests.max_pool_quant8_3 -GeneratedTests.mobilenet* -GeneratedTests.mul* -GeneratedTests.neg* -GeneratedTests.notequal* -GeneratedTests.prelu_ex* -GeneratedTests.reduce_min* -GeneratedTests.relu1* -GeneratedTests.relu6* -GeneratedTests.relu* -GeneratedTests.resize_bilinear* -GeneratedTests.rnn* -GeneratedTests.rsqrt* -GeneratedTests.mean* -GeneratedTests.pad* -GeneratedTests.space_to_depth* -GeneratedTests.sqrt_ex* -GeneratedTests.squared_difference_ex* -GeneratedTests.svdf* -GeneratedTests.tanh_ -GeneratedTests.batch_to_space* -GeneratedTests.div_* -GeneratedTests.space_to_batch* -GeneratedTests.squeeze* -GeneratedTests.strided_slice* -GeneratedTests.sub* -GeneratedTests.transpose* -GeneratedTests.cast_ex* -GeneratedTests.gather_ex* -GeneratedTests.strided_slice_ex* -GeneratedTests.reduce_max_ex* -GeneratedTests.reduce_sum_ex* -GeneratedTests.topk_v2* -# Unhandled exception -GeneratedTests.concat* -GeneratedTests.fully_connected* -GeneratedTests.reshape* -# Unexpected result -GeneratedTests.avg_pool_quant8_5 -GeneratedTests.conv_quant8_2 -GeneratedTests.max_pool_quant8_4 -GeneratedTests.softmax* -GeneratedTests.split* -GeneratedTests.transpose_conv* -GeneratedTests.pack* -GeneratedTests.unpack* -GeneratedTests.logical_not_ex* diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt b/tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt deleted file mode 100644 index 39167e0de..000000000 --- a/tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt +++ /dev/null @@ -1,45 +0,0 @@ -add/1D -add/4D -argmax -average_pool_2d -cast -concat -conv_2d -depthwise_conv_2d -div/broadcast -embedding_lookup -equal -exp -floor -fullyconnected/fc1 -gather -l2_pool_2d -hashtable_lookup -l2_normalization -local_response_normalization -max_pool_2d -mean -MODELS/mobilenet -mul/broadcast -neg -not_equal -prelu -softmax -reduce_max -reduce_min -relu -reshape -rsqrt -relu6 -reshape -resize_bilinear -space_to_depth -strided_slice -sub/broadcast -tanh -topk_v2 -transpose -transpose_conv -MODELS/inception_module -squeeze -custom diff --git a/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt b/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt new file mode 100644 index 000000000..ec52c3669 --- /dev/null +++ b/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt @@ -0,0 +1,36 @@ +add +average_pool_2d +cast +concat/concat1 +concat/concat2 +conv2d +depthwise_conv_2d +div +embedding_lookup +exp +floor +fullyconnected/fc1 +gather +hashtable_lookup +l2_normalization +l2_pool_2d +logistic +max_pool_2d +mean +MODELS/inception_module +MODELS/mobilenet +mul +neg +pad/4D_2D +relu +reul6 +reshape +resize_bilinear +softmax +space_to_depth +squeeze +strided_slice +sub +tanh +topk_v2 +transpose -- cgit v1.2.3