From 13e775c86f909b164b7cc1d35a8a24b964ec622e Mon Sep 17 00:00:00 2001 From: Zhen Wang Date: Mon, 5 Nov 2018 20:34:05 +0800 Subject: [PATCH] use separated dam model. --- paddle/fluid/inference/tests/api/CMakeLists.txt | 2 +- paddle/fluid/inference/tests/api/analyzer_dam_tester.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/paddle/fluid/inference/tests/api/CMakeLists.txt b/paddle/fluid/inference/tests/api/CMakeLists.txt index 89d271d4ac3..850a47aa73a 100644 --- a/paddle/fluid/inference/tests/api/CMakeLists.txt +++ b/paddle/fluid/inference/tests/api/CMakeLists.txt @@ -31,7 +31,7 @@ inference_analysis_api_test(test_analyzer_rnn2 ${RNN2_INSTALL_DIR} analyzer_rnn2 # DAM set(DAM_INSTALL_DIR "${INFERENCE_DEMO_INSTALL_DIR}/dam") -download_model_and_data(${DAM_INSTALL_DIR} "DAM_model.tar.gz" "DAM_data.txt.tar.gz") +download_model_and_data(${DAM_INSTALL_DIR} "DAM_separated_model.tar.gz" "DAM_data.txt.tar.gz") inference_analysis_api_test(test_analyzer_dam ${DAM_INSTALL_DIR} analyzer_dam_tester.cc) # chinese_ner diff --git a/paddle/fluid/inference/tests/api/analyzer_dam_tester.cc b/paddle/fluid/inference/tests/api/analyzer_dam_tester.cc index 9fdcf8226be..a85cb5c7e61 100644 --- a/paddle/fluid/inference/tests/api/analyzer_dam_tester.cc +++ b/paddle/fluid/inference/tests/api/analyzer_dam_tester.cc @@ -152,8 +152,7 @@ void PrepareInputs(std::vector *input_slots, DataRecord *data, } void SetConfig(contrib::AnalysisConfig *cfg) { - cfg->prog_file = FLAGS_infer_model + "/__model__"; - cfg->param_file = FLAGS_infer_model + "/param"; + cfg->model_dir = FLAGS_infer_model; cfg->use_gpu = false; cfg->device = 0; cfg->specify_input_name = true; -- GitLab