提交 b854d959 编写于 作者: T Tao Luo

update with comments

上级 75bb0bab
......@@ -20,7 +20,7 @@ namespace paddle {
namespace inference {
namespace analysis {
void SetConfig(AnalysisConfig *cfg, bool _use_mkldnn = FLAGS__use_mkldnn) {
void SetConfig(AnalysisConfig *cfg) {
cfg->param_file = FLAGS_infer_model + "/params";
cfg->prog_file = FLAGS_infer_model + "/model";
cfg->use_gpu = false;
......@@ -28,7 +28,7 @@ void SetConfig(AnalysisConfig *cfg, bool _use_mkldnn = FLAGS__use_mkldnn) {
cfg->enable_ir_optim = true;
cfg->specify_input_name = true;
#ifdef PADDLE_WITH_MKLDNN
cfg->_use_mkldnn = _use_mkldnn;
cfg->_use_mkldnn = FLAGS_use_MKLDNN;
#endif
}
......@@ -96,9 +96,11 @@ TEST(Analyzer_resnet50, compare) {
// since default config._use_mkldnn=true in this case,
// we should compare analysis_outputs in config._use_mkldnn=false
// with native_outputs as well.
FLAGS_use_MKLDNN = false;
AnalysisConfig cfg1;
SetConfig(&cfg1, false);
SetConfig(&cfg1);
CompareNativeAndAnalysis(cfg1, input_slots_all);
FLAGS_use_MKLDNN = true;
#endif
}
......
......@@ -50,7 +50,7 @@ Record ProcessALine(const std::string &line) {
return record;
}
void SetConfig(AnalysisConfig *cfg, bool _use_mkldnn = FLAGS__use_mkldnn) {
void SetConfig(AnalysisConfig *cfg) {
cfg->param_file = FLAGS_infer_model + "/__params__";
cfg->prog_file = FLAGS_infer_model + "/__model__";
cfg->use_gpu = false;
......@@ -60,7 +60,7 @@ void SetConfig(AnalysisConfig *cfg, bool _use_mkldnn = FLAGS__use_mkldnn) {
// TODO(TJ): fix fusion gru
cfg->ir_passes.push_back("fc_gru_fuse_pass");
#ifdef PADDLE_WITH_MKLDNN
cfg->_use_mkldnn = _use_mkldnn;
cfg->_use_mkldnn = FLAGS_use_MKLDNN;
#endif
}
......@@ -129,9 +129,11 @@ TEST(Analyzer_vis, compare) {
// since default config._use_mkldnn=true in this case,
// we should compare analysis_outputs in config._use_mkldnn=false
// with native_outputs as well.
FLAGS_use_MKLDNN = false;
AnalysisConfig cfg1;
SetConfig(&cfg1, false);
SetConfig(&cfg1);
CompareNativeAndAnalysis(cfg1, input_slots_all);
FLAGS_use_MKLDNN = true;
#endif
}
......
......@@ -35,7 +35,7 @@ DEFINE_bool(test_all_data, false, "Test the all dataset in data file.");
DEFINE_int32(num_threads, 1, "Running the inference program in multi-threads.");
DEFINE_bool(use_analysis, true,
"Running the inference program in analysis mode.");
DEFINE_bool(_use_mkldnn, true,
DEFINE_bool(use_MKLDNN, true,
"Running the inference program with mkldnn library.");
namespace paddle {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册