[runtime/CI] Use BACKENDS envvar to select backend (#9143)

To select backend, use BACKENDS Instead of OP_BACKENDS_ALLOPS

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/infra/scripts/test_arm_neurun_acl_cl.sh b/infra/scripts/test_arm_neurun_acl_cl.sh
index 02d181a..1c7a415 100755 (executable)
--- a/infra/scripts/test_arm_neurun_acl_cl.sh
+++ b/infra/scripts/test_arm_neurun_acl_cl.sh
@@ -15,7 +15,7 @@ set -e
 
 pushd $ROOT_PATH > /dev/null
 
-export OP_BACKEND_ALLOPS=acl_cl
+export BACKENDS="acl_cl"
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux ./Product/out/unittest/nnapi_gtest.skip
 export EXECUTOR=Linear

diff --git a/infra/scripts/test_arm_neurun_acl_neon.sh b/infra/scripts/test_arm_neurun_acl_neon.sh
index a2c7155..a95bb65 100755 (executable)
--- a/infra/scripts/test_arm_neurun_acl_neon.sh
+++ b/infra/scripts/test_arm_neurun_acl_neon.sh
@@ -15,7 +15,7 @@ set -e
 
 pushd $ROOT_PATH > /dev/null
 
-export OP_BACKEND_ALLOPS=acl_neon
+export BACKENDS="acl_neon"
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.acl_neon ./Product/out/unittest/nnapi_gtest.skip
 export EXECUTOR=Linear

diff --git a/infra/scripts/test_arm_neurun_cpu.sh b/infra/scripts/test_arm_neurun_cpu.sh
index ca07cc8..c70edde 100755 (executable)
--- a/infra/scripts/test_arm_neurun_cpu.sh
+++ b/infra/scripts/test_arm_neurun_cpu.sh
@@ -15,7 +15,7 @@ set -e
 
 pushd $ROOT_PATH > /dev/null
 
-export OP_BACKEND_ALLOPS=cpu
+export BACKENDS="cpu"
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-linux.cpu ./Product/out/unittest/nnapi_gtest.skip
 export EXECUTOR=Linear

diff --git a/infra/scripts/test_arm_neurun_mixed.sh b/infra/scripts/test_arm_neurun_mixed.sh
index 5fc2376..a793bb3 100755 (executable)
--- a/infra/scripts/test_arm_neurun_mixed.sh
+++ b/infra/scripts/test_arm_neurun_mixed.sh
@@ -20,7 +20,7 @@ export EXECUTOR=Linear
 # NOTE Fixed backend assignment by type of operation
 # TODO Enhance this with randomized test
 BACKENDS=(cpu acl_cl acl_neon)
-unset OP_BACKEND_ALLOPS
+export BACKENDS="acl_cl;acl_neon;cpu"
 export OP_BACKEND_Conv2D=cpu
 export OP_BACKEND_MaxPool2D=acl_cl
 export OP_BACKEND_AvgPool2D=acl_neon

diff --git a/infra/scripts/test_tizen_neurun_acl_cl.sh b/infra/scripts/test_tizen_neurun_acl_cl.sh
index 71c1cc6..59bf947 100755 (executable)
--- a/infra/scripts/test_tizen_neurun_acl_cl.sh
+++ b/infra/scripts/test_tizen_neurun_acl_cl.sh
@@ -9,7 +9,7 @@ set -e
 
 pushd $ROOT_PATH > /dev/null
 
-export OP_BACKEND_ALLOPS=acl_cl
+export BACKENKDS=acl_cl
 
 cp -v ./Product/out/unittest/nnapi_gtest.skip.armv7l-tizen ./Product/out/unittest/nnapi_gtest.skip
 export EXECUTOR=Linear

diff --git a/infra/scripts/test_tizen_neurun_mixed.sh b/infra/scripts/test_tizen_neurun_mixed.sh
index abce9a6..9e1939b 100755 (executable)
--- a/infra/scripts/test_tizen_neurun_mixed.sh
+++ b/infra/scripts/test_tizen_neurun_mixed.sh
@@ -14,7 +14,7 @@ export EXECUTOR=Linear
 # NOTE Fixed backend assignment by type of operation
 # TODO Enhance this with randomized test
 BACKENDS=(cpu acl_cl acl_neon)
-unset OP_BACKEND_ALLOPS
+export BACKENDS="acl_cl;acl_neon;cpu"
 export OP_BACKEND_Conv2D=cpu
 export OP_BACKEND_MaxPool2D=acl_cl
 export OP_BACKEND_AvgPool2D=acl_neon

diff --git a/infra/scripts/test_x64_neurun_cpu.sh b/infra/scripts/test_x64_neurun_cpu.sh
index 7e32e02..450a5c8 100755 (executable)
--- a/infra/scripts/test_x64_neurun_cpu.sh
+++ b/infra/scripts/test_x64_neurun_cpu.sh
@@ -16,8 +16,6 @@ set -e
 pushd $ROOT_PATH > /dev/null
 
 export BACKENDS=cpu
-export OP_BACKEND_ALLOPS=cpu
-
 ./tests/scripts/test_driver.sh \
   --frameworktest_list_file=./tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt \
   --reportdir=$ROOT_PATH/report/ .