Change default runtime to neurun (#5042)

* Change default runtime to neurun

Change default runtime: pacl -> neurun

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
* Enable loggin runtime default

diff --git a/cmake/CfgOptionFlags.cmake b/cmake/CfgOptionFlags.cmake
index 02997b6..468229a 100644 (file)
--- 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 caabe48..c5e3995 100644 (file)
--- 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 e285c6d..4122848 100644 (file)
--- 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 431970c..486b3bb 100644 (file)
--- 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 2e2c989..5c62933 100644 (file)
--- 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 defdfba..687c523 100644 (file)
--- 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 7812857..179e5bd 100644 (file)
--- 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 f1670f3..6508d79 100644 (file)
--- 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 c9a7d51..4489643 100644 (file)
--- 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 845ca9d..3686960 100644 (file)
--- 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 5d33ea1..850b7c0 100644 (file)
--- 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 b03b927..9b25f64 100644 (file)
--- 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 001fa72..fac3d8d 100644 (file)
--- 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 9645e09..b45db66 100644 (file)
--- 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 ab46b29..6520b7f 100755 (executable)
--- 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 b5c35c2..38c7a5c 100755 (executable)
--- 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 164687c..4d768ee 100755 (executable)
--- 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 eec7e6b..893d9a7 100755 (executable)
--- 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 404cb66..54b2d07 100755 (executable)
--- 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 c01c308..85fbb57 100755 (executable)
--- 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 f9af739..0d66eb1 100755 (executable)
--- 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 211e1fb..eb50e26 100755 (executable)
--- 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 094fc3f..6fb9b10 100755 (executable)
--- 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 c50972a..2381adb 100755 (executable)
--- 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 11513d3..25f9adf 100755 (executable)
--- 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 b17a3bd..b23d687 100644 (file)
--- 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 bb71cad..fd22e70 100644 (file)
--- 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 47f8787..944f0bb 100644 (file)
--- 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 456773a..632c362 100644 (file)
--- 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 8cde1a2..000f7c8 100644 (file)
--- 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 9e0de22..a201c86 100644 (file)
--- 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 255cd7b..d636b8b 100644 (file)
--- 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 7884000..2f370ea 100644 (file)
--- 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 d9ca89a..6c54779 100644 (file)
--- 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 c97f8af..87aa852 100644 (file)
--- 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 79af05b..cb09602 100644 (file)
--- 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 27a18d3..27bcab4 100644 (file)
--- 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.neurun.acl_neon b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
similarity index 100%
rename from tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon
rename to tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu
similarity index 100%
rename from tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu
rename to tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun
deleted file mode 100644 (file)
index 27bcab4..0000000
--- 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.pacl b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.pacl
new file mode 100644 (file)
index 0000000..27a18d3
--- /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.neurun b/tests/nnapi/nnapi_gtest.skip.x86_64-linux
similarity index 100%
rename from tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun
rename to tests/nnapi/nnapi_gtest.skip.x86_64-linux

diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt b/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt
similarity index 60%
rename from tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt
rename to tests/scripts/pacl_frameworktest_list.armv7l-linux.txt
index 39167e0..ec52c36 100644 (file)
--- a/tests/scripts/neurun_frameworktest_list.armv7l.acl_cl.txt
+++ b/tests/scripts/pacl_frameworktest_list.armv7l-linux.txt
@@ -1,45 +1,36 @@
-add/1D
-add/4D
-argmax
+add
 average_pool_2d
 cast
-concat
-conv_2d
+concat/concat1
+concat/concat2
+conv2d
 depthwise_conv_2d
-div/broadcast
+div
 embedding_lookup
-equal
 exp
 floor
 fullyconnected/fc1
 gather
-l2_pool_2d
 hashtable_lookup
 l2_normalization
-local_response_normalization
+l2_pool_2d
+logistic
 max_pool_2d
 mean
+MODELS/inception_module
 MODELS/mobilenet
-mul/broadcast
+mul
 neg
-not_equal
-prelu
-softmax
-reduce_max
-reduce_min
+pad/4D_2D
 relu
-reshape
-rsqrt
-relu6
+reul6
 reshape
 resize_bilinear
+softmax
 space_to_depth
+squeeze
 strided_slice
-sub/broadcast
+sub
 tanh
 topk_v2
 transpose
-transpose_conv
-MODELS/inception_module
-squeeze
-custom