Skip to content

Commit d0fbe78

Browse files
luotao1luotao1
committed
move analyzer_xxx_tester to inference/tests/api
1 parent 83af1b3 commit d0fbe78

File tree

7 files changed

+62
-65
lines changed

7 files changed

+62
-65
lines changed

‎paddle/fluid/inference/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ if(NOT APPLE)
5555
endif()
5656

5757
if(WITH_TESTING)
58-
# both tests/book and analysis depends the models that generated by python/paddle/fluid/tests/book
58+
# tests/book depends the models that generated by python/paddle/fluid/tests/book
5959
add_subdirectory(tests/book)
60+
add_subdirectory(tests/api)
6061
endif()

‎paddle/fluid/inference/analysis/CMakeLists.txt

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,6 @@ inference_analysis_test(test_analyzer SRCS analyzer_tester.cc
4444
EXTRA_DEPS paddle_inference_api paddle_fluid_api ir_pass_manager analysis_predictor
4545
ARGS --inference_model_dir=${PYTHON_TESTS_DIR}/book/word2vec.inference.model)
4646

47-
function (inference_download_and_uncompress install_dir url gz_filename)
48-
message(STATUS "Download inference test stuff ${gz_filename} from ${url}")
49-
execute_process(COMMAND bash -c "mkdir -p ${install_dir}")
50-
execute_process(COMMAND bash -c "cd ${install_dir} && wget -q ${url}")
51-
execute_process(COMMAND bash -c "cd ${install_dir} && tar xzf ${gz_filename}")
52-
message(STATUS "finish downloading ${gz_filename}")
53-
endfunction(inference_download_and_uncompress)
54-
55-
set(RNN1_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/rnn1%2Fmodel.tar.gz")
56-
set(RNN1_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/rnn1%2Fdata.txt.tar.gz")
57-
set(RNN1_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/rnn1" CACHE PATH "RNN1 model and data root." FORCE)
58-
if (NOT EXISTS ${RNN1_INSTALL_DIR} AND WITH_TESTING)
59-
inference_download_and_uncompress(${RNN1_INSTALL_DIR} ${RNN1_MODEL_URL} "rnn1%2Fmodel.tar.gz")
60-
inference_download_and_uncompress(${RNN1_INSTALL_DIR} ${RNN1_DATA_URL} "rnn1%2Fdata.txt.tar.gz")
61-
endif()
62-
63-
inference_analysis_test(test_analyzer_rnn1 SRCS analyzer_rnn1_tester.cc
64-
EXTRA_DEPS paddle_inference_api paddle_fluid_api ir_pass_manager analysis_predictor
65-
ARGS --infer_model=${RNN1_INSTALL_DIR}/model
66-
--infer_data=${RNN1_INSTALL_DIR}/data.txt)
67-
6847
inference_analysis_test(test_data_flow_graph SRCS data_flow_graph_tester.cc)
6948
inference_analysis_test(test_data_flow_graph_to_fluid_pass SRCS data_flow_graph_to_fluid_pass_tester.cc)
7049
inference_analysis_test(test_fluid_to_ir_pass SRCS fluid_to_ir_pass_tester.cc)
@@ -75,46 +54,3 @@ inference_analysis_test(test_tensorrt_subgraph_pass SRCS tensorrt_subgraph_pass_
7554
inference_analysis_test(test_pass_manager SRCS pass_manager_tester.cc)
7655
inference_analysis_test(test_tensorrt_subgraph_node_mark_pass SRCS tensorrt_subgraph_node_mark_pass_tester.cc)
7756
inference_analysis_test(test_model_store_pass SRCS model_store_pass_tester.cc)
78-
79-
set(CHINESE_NER_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/chinese_ner_model.tar.gz")
80-
set(CHINESE_NER_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/chinese_ner-data.txt.tar.gz")
81-
set(CHINESE_NER_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/chinese_ner" CACHE PATH "Chinese ner model and data root." FORCE)
82-
if (NOT EXISTS ${CHINESE_NER_INSTALL_DIR} AND WITH_TESTING AND WITH_INFERENCE)
83-
inference_download_and_uncompress(${CHINESE_NER_INSTALL_DIR} ${CHINESE_NER_MODEL_URL} "chinese_ner_model.tar.gz")
84-
inference_download_and_uncompress(${CHINESE_NER_INSTALL_DIR} ${CHINESE_NER_DATA_URL} "chinese_ner-data.txt.tar.gz")
85-
endif()
86-
87-
inference_analysis_test(test_analyzer_ner SRCS analyzer_ner_tester.cc
88-
EXTRA_DEPS paddle_inference_api paddle_fluid_api analysis_predictor
89-
ARGS --infer_model=${CHINESE_NER_INSTALL_DIR}/model
90-
--infer_data=${CHINESE_NER_INSTALL_DIR}/data.txt)
91-
92-
set(LAC_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/lac_model.tar.gz")
93-
set(LAC_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/lac_data.txt.tar.gz")
94-
set(LAC_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/lac" CACHE PATH "LAC model and data root." FORCE)
95-
if (NOT EXISTS ${LAC_INSTALL_DIR} AND WITH_TESTING AND WITH_INFERENCE)
96-
inference_download_and_uncompress(${LAC_INSTALL_DIR} ${LAC_MODEL_URL} "lac_model.tar.gz")
97-
inference_download_and_uncompress(${LAC_INSTALL_DIR} ${LAC_DATA_URL} "lac_data.txt.tar.gz")
98-
endif()
99-
100-
inference_analysis_test(test_analyzer_lac SRCS analyzer_lac_tester.cc
101-
EXTRA_DEPS paddle_inference_api paddle_fluid_api ir_pass_manager analysis_predictor
102-
ARGS --infer_model=${LAC_INSTALL_DIR}/model
103-
--infer_data=${LAC_INSTALL_DIR}/data.txt)
104-
105-
106-
set(TEXT_CLASSIFICATION_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/text-classification-Senta.tar.gz")
107-
set(TEXT_CLASSIFICATION_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/text_classification_data.txt.tar.gz")
108-
set(TEXT_CLASSIFICATION_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/text_classification" CACHE PATH "Text Classification model and data root." FORCE)
109-
110-
if (NOT EXISTS ${TEXT_CLASSIFICATION_INSTALL_DIR} AND WITH_TESTING AND WITH_INFERENCE)
111-
inference_download_and_uncompress(${TEXT_CLASSIFICATION_INSTALL_DIR} ${TEXT_CLASSIFICATION_MODEL_URL} "text-classification-Senta.tar.gz")
112-
inference_download_and_uncompress(${TEXT_CLASSIFICATION_INSTALL_DIR} ${TEXT_CLASSIFICATION_DATA_URL} "text_classification_data.txt.tar.gz")
113-
endif()
114-
115-
inference_analysis_test(test_text_classification SRCS analyzer_text_classification_tester.cc
116-
EXTRA_DEPS paddle_inference_api paddle_fluid_api analysis_predictor
117-
ARGS --infer_model=${TEXT_CLASSIFICATION_INSTALL_DIR}/text-classification-Senta
118-
--infer_data=${TEXT_CLASSIFICATION_INSTALL_DIR}/data.txt
119-
--topn=1 # Just run top 1 batch.
120-
)

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
function (inference_download_and_uncompress install_dir url gz_filename)
2+
message(STATUS "Download inference test stuff ${gz_filename} from ${url}")
3+
execute_process(COMMAND bash -c "mkdir -p ${install_dir}")
4+
execute_process(COMMAND bash -c "cd ${install_dir} && wget -q ${url}")
5+
execute_process(COMMAND bash -c "cd ${install_dir} && tar xzf ${gz_filename}")
6+
message(STATUS "finish downloading ${gz_filename}")
7+
endfunction(inference_download_and_uncompress)
8+
9+
function(download_model_and_data install_dir model_url model_gz_filename data_url data_gz_filename)
10+
if (NOT EXISTS ${install_dir} AND WITH_INFERENCE)
11+
inference_download_and_uncompress(${install_dir} ${model_url} ${model_gz_filename})
12+
inference_download_and_uncompress(${install_dir} ${data_url} ${data_gz_filename})
13+
endif()
14+
endfunction()
15+
16+
# RNN1
17+
set(RNN1_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/rnn1%2Fmodel.tar.gz")
18+
set(RNN1_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/rnn1%2Fdata.txt.tar.gz")
19+
set(RNN1_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/rnn1")
20+
download_model_and_data(${RNN1_INSTALL_DIR} ${RNN1_MODEL_URL} "rnn1%2Fmodel.tar.gz"
21+
${RNN1_DATA_URL} "rnn1%2Fdata.txt.tar.gz")
22+
inference_analysis_test(test_analyzer_rnn1 SRCS analyzer_rnn1_tester.cc
23+
EXTRA_DEPS paddle_inference_api paddle_fluid_api ir_pass_manager analysis_predictor
24+
ARGS --infer_model=${RNN1_INSTALL_DIR}/model
25+
--infer_data=${RNN1_INSTALL_DIR}/data.txt)
26+
27+
# chinese_ner
28+
set(CHINESE_NER_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/chinese_ner_model.tar.gz")
29+
set(CHINESE_NER_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/chinese_ner-data.txt.tar.gz")
30+
set(CHINESE_NER_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/chinese_ner")
31+
download_model_and_data(${CHINESE_NER_INSTALL_DIR} ${CHINESE_NER_MODEL_URL} "chinese_ner_model.tar.gz"
32+
${CHINESE_NER_DATA_URL} "chinese_ner-data.txt.tar.gz")
33+
inference_analysis_test(test_analyzer_ner SRCS analyzer_ner_tester.cc
34+
EXTRA_DEPS paddle_inference_api paddle_fluid_api analysis_predictor
35+
ARGS --infer_model=${CHINESE_NER_INSTALL_DIR}/model
36+
--infer_data=${CHINESE_NER_INSTALL_DIR}/data.txt)
37+
38+
# lac
39+
set(LAC_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/lac_model.tar.gz")
40+
set(LAC_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/lac_data.txt.tar.gz")
41+
set(LAC_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/lac")
42+
download_model_and_data(${LAC_INSTALL_DIR} ${LAC_MODEL_URL} "lac_model.tar.gz"
43+
${LAC_DATA_URL} "lac_data.txt.tar.gz")
44+
inference_analysis_test(test_analyzer_lac SRCS analyzer_lac_tester.cc
45+
EXTRA_DEPS paddle_inference_api paddle_fluid_api ir_pass_manager analysis_predictor
46+
ARGS --infer_model=${LAC_INSTALL_DIR}/model
47+
--infer_data=${LAC_INSTALL_DIR}/data.txt)
48+
49+
# text_classification
50+
set(TEXT_CLASSIFICATION_MODEL_URL "http://paddle-inference-dist.bj.bcebos.com/text-classification-Senta.tar.gz")
51+
set(TEXT_CLASSIFICATION_DATA_URL "http://paddle-inference-dist.bj.bcebos.com/text_classification_data.txt.tar.gz")
52+
set(TEXT_CLASSIFICATION_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo/text_classification")
53+
download_model_and_data(${TEXT_CLASSIFICATION_INSTALL_DIR} ${TEXT_CLASSIFICATION_MODEL_URL} "text_classification-Senta.tar.gz"
54+
${TEXT_CLASSIFICATION_DATA_URL} "text_classification_data.txt.tar.gz")
55+
inference_analysis_test(test_text_classification SRCS analyzer_text_classification_tester.cc
56+
EXTRA_DEPS paddle_inference_api paddle_fluid_api analysis_predictor
57+
ARGS --infer_model=${TEXT_CLASSIFICATION_INSTALL_DIR}/text-classification-Senta
58+
--infer_data=${TEXT_CLASSIFICATION_INSTALL_DIR}/data.txt
59+
--topn=1 # Just run top 1 batch.
60+
)

‎paddle/fluid/inference/analysis/analyzer_lac_tester.cc renamed to ‎paddle/fluid/inference/tests/api/analyzer_lac_tester.cc

File renamed without changes.

‎paddle/fluid/inference/analysis/analyzer_ner_tester.cc renamed to ‎paddle/fluid/inference/tests/api/analyzer_ner_tester.cc

File renamed without changes.

‎paddle/fluid/inference/analysis/analyzer_rnn1_tester.cc renamed to ‎paddle/fluid/inference/tests/api/analyzer_rnn1_tester.cc

File renamed without changes.

‎paddle/fluid/inference/analysis/analyzer_text_classification_tester.cc renamed to ‎paddle/fluid/inference/tests/api/analyzer_text_classification_tester.cc

File renamed without changes.

0 commit comments

Comments
 (0)