提交 3fa9fff8 编写于 作者: S superjomn

update

上级 8310c8f9
...@@ -74,18 +74,16 @@ endif() ...@@ -74,18 +74,16 @@ endif()
# These tests needs CLI arguments, and is not supported in ARM CI. # These tests needs CLI arguments, and is not supported in ARM CI.
# TODO(Superjomn) support latter. # TODO(Superjomn) support latter.
lite_cc_test(test_light_api SRCS light_api_test.cc lite_cc_test(test_light_api_lite SRCS light_api_test.cc
DEPS light_api_lite program_lite mir_passes DEPS light_api_lite program_lite mir_passes
ARGS --optimized_model=${LITE_MODEL_DIR}/lite_naive_model_opt ARGS --optimized_model=${LITE_MODEL_DIR}/lite_naive_model_opt
SERIAL) SERIAL)
if(NOT LITE_ON_MOBILE) lite_cc_test(test_apis_lite SRCS apis_test.cc
lite_cc_test(test_apis_lite SRCS apis_test.cc DEPS cxx_api_lite light_api_lite ${ops_lite}
DEPS cxx_api_lite light_api_lite ${ops_lite} X86_DEPS ${x86_kernels} operator
X86_DEPS ${x86_kernels} operator ARGS --model_dir=${LITE_MODEL_DIR}/lite_naive_model
ARGS --model_dir=${LITE_MODEL_DIR}/lite_naive_model --optimized_model=${LITE_MODEL_DIR}/lite_naive_model_opt SERIAL)
--optimized_model=${LITE_MODEL_DIR}/lite_naive_model_opt SERIAL)
endif()
#lite_cc_binary(cxx_api_lite_bin SRCS cxx_api_bin.cc #lite_cc_binary(cxx_api_lite_bin SRCS cxx_api_bin.cc
#X86_DEPS operator #X86_DEPS operator
......
...@@ -99,7 +99,7 @@ function test_arm_android { ...@@ -99,7 +99,7 @@ function test_arm_android {
echo "test name: ${test_name}" echo "test name: ${test_name}"
adb_work_dir="/data/local/tmp" adb_work_dir="/data/local/tmp"
skip_list=("test_model_parser_lite" "test_mobilenetv1_lite" "test_mobilenetv2_lite" "test_resnet50_lite" "test_inceptionv4_lite" "test_light_api") skip_list=("test_model_parser_lite" "test_mobilenetv1_lite" "test_mobilenetv2_lite" "test_resnet50_lite" "test_inceptionv4_lite" "test_light_api_lite" "test_apis_lite")
for skip_name in ${skip_list[@]} ; do for skip_name in ${skip_list[@]} ; do
[[ $skip_name =~ (^|[[:space:]])$test_name($|[[:space:]]) ]] && echo "skip $test_name" && return [[ $skip_name =~ (^|[[:space:]])$test_name($|[[:space:]]) ]] && echo "skip $test_name" && return
done done
...@@ -351,6 +351,22 @@ function build_test_arm_subtask_model { ...@@ -351,6 +351,22 @@ function build_test_arm_subtask_model {
echo "Done" echo "Done"
} }
# this test load a model, optimize it and check the prediction result of both cxx and light APIS.
function test_arm_predict_apis {
local port=$1
local workspace=$2
local naive_model_path=$3
local api_test_path=$(find . -name "test_apis_lite")
# the model is pushed to ./lite_naive_model
adb -s emulator-${port} push ${naive_model_path} ${workspace}
adb -s emulator-${port} push $api_test_path ${workspace}
# test cxx_api first to store the optimized model.
adb -s emulator-${port} shell ./test_apis_lite --model_dir ./lite_naive_model --optimized_model ./lite_naive_model_opt
}
# Build the code and run lite arm tests. This is executed in the CI system. # Build the code and run lite arm tests. This is executed in the CI system.
function build_test_arm { function build_test_arm {
######################################################################## ########################################################################
......
...@@ -38,7 +38,7 @@ static void MkDirRecur(const std::string& path) { ...@@ -38,7 +38,7 @@ static void MkDirRecur(const std::string& path) {
CHECK_EQ(system(string_format("mkdir -p %s", path.c_str()).c_str()), 0) CHECK_EQ(system(string_format("mkdir -p %s", path.c_str()).c_str()), 0)
<< "Cann't mkdir " << path; << "Cann't mkdir " << path;
#else // On ARM #else // On ARM
CHECK_NE(mkddir(path.c_str(), S_IRWXU), -1) << "Cann't mkdir " << path; CHECK_NE(mkdir(path.c_str(), S_IRWXU), -1) << "Cann't mkdir " << path;
#endif #endif
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册