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

18 files changed, 74 insertions, 92 deletions

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.neurun.acl_neon b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.acl_neon
index c6f7249e5..c6f7249e5 100644
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.acl_neon
+++ b/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
index 630e98ab6..630e98ab6 100644
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.neurun.cpu
+++ b/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
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.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.neurun b/tests/nnapi/nnapi_gtest.skip.x86_64-linux
index dca5dc763..dca5dc763 100644
--- a/tests/nnapi/nnapi_gtest.skip.x86_64-linux.neurun
+++ b/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
index 39167e0de..ec52c3669 100644
--- 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