Merge pull request #13997 from wojtuss/wojtuss/do-not-enable-mkldnn-twice

luotao1 · web-flow · commit a4b48f70c171 · 2018-10-20T12:43:53.000+08:00
do not enable MKL-DNN twice
diff --git a/paddle/fluid/inference/api/analysis_predictor.cc b/paddle/fluid/inference/api/analysis_predictor.cc
@@ -77,10 +77,6 @@ bool AnalysisPredictor::Init(
     inference_program_ = program;
   }
 
-  if (config_._use_mkldnn) {
-    executor_->EnableMKLDNN(*inference_program_);
-  }
-
   executor_->Prepare(scope_.get(), *inference_program_, 0,
                      config_.use_feed_fetch_ops);
 

Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,6 @@ bool AnalysisPredictor::Init(`
`77`	`77`	`inference_program_ = program;`
`78`	`78`	`}`
`79`	`79`
`80`		`- if (config_._use_mkldnn) {`
`81`		`- executor_->EnableMKLDNN(*inference_program_);`
`82`		`- }`
`83`		`-`
`84`	`80`	`executor_->Prepare(scope_.get(), *inference_program_, 0,`
`85`	`81`	`config_.use_feed_fetch_ops);`
`86`	`82`