Skip to content

Commit 2ec65ae

Browse files
committed
download face_model in CMakeLists.txt
test=develop
1 parent 2f9a5a2 commit 2ec65ae

File tree

3 files changed

+37
-8
lines changed

3 files changed

+37
-8
lines changed

paddle/fluid/inference/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
if(WITH_TESTING)
2-
include(test.cmake) # some generic cmake funtion for inference
2+
include(tests/test.cmake) # some generic cmake funtion for inference
33
endif()
44
# analysis and tensorrt must be added before creating static library,
55
# otherwise, there would be undefined reference to them in static library.

paddle/fluid/inference/tests/api/CMakeLists.txt

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
set(INFERENCE_EXTRA_DEPS paddle_inference_api paddle_fluid_api ir_pass_manager analysis_predictor)
22

3+
function(download_model install_dir model_name)
4+
if (NOT EXISTS ${install_dir})
5+
inference_download_and_uncompress(${install_dir} ${INFERENCE_URL} ${model_name})
6+
endif()
7+
endfunction()
8+
39
function(download_model_and_data install_dir model_name data_name)
410
if (NOT EXISTS ${install_dir})
511
inference_download_and_uncompress(${install_dir} ${INFERENCE_URL} ${model_name})
@@ -13,6 +19,13 @@ function(inference_analysis_api_test target install_dir filename)
1319
ARGS --infer_model=${install_dir}/model --infer_data=${install_dir}/data.txt)
1420
endfunction()
1521

22+
function(inference_analysis_api_test_with_fake_data target install_dir filename model_name)
23+
download_model(${install_dir} ${model_name})
24+
inference_analysis_test(${target} SRCS ${filename}
25+
EXTRA_DEPS ${INFERENCE_EXTRA_DEPS}
26+
ARGS --infer_model=${install_dir}/model)
27+
endfunction()
28+
1629
# RNN1
1730
if(NOT APPLE)
1831
set(RNN1_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/rnn1")
@@ -61,17 +74,33 @@ inference_analysis_api_test(test_analyzer_seq_conv1 ${SEQ_CONV1_INSTALL_DIR} ana
6174
# ocr
6275
set(OCR_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/ocr")
6376
if (NOT EXISTS ${OCR_INSTALL_DIR})
64-
inference_download_and_uncompress(${OCR_INSTALL_DIR} "http://paddlemodels.cdn.bcebos.com/" "inference-vis-demos%2Focr.tar.gz")
77+
inference_download_and_uncompress(${OCR_INSTALL_DIR} "http://paddlemodels.cdn.bcebos.com/" "inference-vis-demos%2Focr.tar.gz")
6578
endif()
6679
inference_analysis_api_test(test_analyzer_ocr ${OCR_INSTALL_DIR} analyzer_vis_tester.cc)
6780

6881
# resnet50
69-
set(RESNET50_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/resnet50")
70-
if (NOT EXISTS ${RESNET50_INSTALL_DIR})
71-
inference_download_and_uncompress(${RESNET50_INSTALL_DIR} ${INFERENCE_URL} "resnet50_model.tar.gz")
72-
endif()
73-
inference_analysis_test(test_analyzer_resnet50 SRCS analyzer_resnet50_tester.cc
74-
EXTRA_DEPS ${INFERENCE_EXTRA_DEPS} ARGS --infer_model=${RESNET50_INSTALL_DIR}/model)
82+
inference_analysis_api_test_with_fake_data(test_analyzer_resnet50
83+
"${INFERENCE_DEMO_INSTALL_DIR}/resnet50" analyzer_resnet50_tester.cc "resnet50_model.tar.gz")
84+
85+
# face
86+
set(FACE_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/face")
87+
inference_analysis_api_test_with_fake_data(test_analyzer_face_align1
88+
"${FACE_INSTALL_DIR}/align1" analyzer_face_tester.cc "face%2Falign1_model.tar.gz")
89+
inference_analysis_api_test_with_fake_data(test_analyzer_face_align2
90+
"${FACE_INSTALL_DIR}/align2" analyzer_face_tester.cc "face%2Falign2_model.tar.gz")
91+
inference_analysis_api_test_with_fake_data(test_analyzer_face_feature1
92+
"${FACE_INSTALL_DIR}/feature1" analyzer_face_tester.cc "face%2Ffeature_id_model.tar.gz")
93+
# TODO(luotao): Disable this test due to analysis is timeout 10 minutes.
94+
# inference_analysis_api_test_with_fake_data(test_analyzer_face_feature2
95+
# "${FACE_INSTALL_DIR}/feature2" analyzer_face_tester.cc "face%2Ffeature_life_model.tar.gz")
96+
inference_analysis_api_test_with_fake_data(test_analyzer_face_detect
97+
"${FACE_INSTALL_DIR}/detect" analyzer_face_tester.cc "face%2Fdetect_model.tar.gz")
98+
inference_analysis_api_test_with_fake_data(test_analyzer_face_demark
99+
"${FACE_INSTALL_DIR}/demark" analyzer_face_tester.cc "face%2Fdemark_model.tar.gz")
100+
inference_analysis_api_test_with_fake_data(test_analyzer_face_score
101+
"${FACE_INSTALL_DIR}/score" analyzer_face_tester.cc "face%2Fscore_model.tar.gz")
102+
inference_analysis_api_test_with_fake_data(test_analyzer_face_super_res
103+
"${FACE_INSTALL_DIR}/super_res" analyzer_face_tester.cc "face%2Fsuper_res_model.tar.gz")
75104

76105
# anakin
77106
if (WITH_ANAKIN AND WITH_MKL) # only needed in CI

0 commit comments

Comments
 (0)