Merge pull request #13776 from luotao1/revert_fast_math

luotao1 · web-flow · commit 59c306eb52ea · 2018-10-09T17:06:40.000+08:00
revert with_fast_math to ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,7 +72,7 @@ option(WITH_INFERENCE    "Compile fluid inference library"              ON)
 option(WITH_INFERENCE_API_TEST   "Test fluid inference high-level api interface"  OFF)
 option(WITH_SYSTEM_BLAS   "Use system blas library"           OFF)
 option(PY_VERSION       "Compile PaddlePaddle with python3 support"     ${PY_VERSION})
-option(WITH_FAST_MATH   "Make use of fast math library"                 OFF)
+option(WITH_FAST_MATH   "Make use of fast math library, might affect the precision to some extent" ON)
 
 # PY_VERSION
 if(NOT PY_VERSION)
diff --git a/paddle/fluid/inference/tests/api/analyzer_resnet50_tester.cc b/paddle/fluid/inference/tests/api/analyzer_resnet50_tester.cc
@@ -27,9 +27,6 @@ void SetConfig(AnalysisConfig *cfg) {
   cfg->device = 0;
   cfg->enable_ir_optim = true;
   cfg->specify_input_name = true;
-#ifdef PADDLE_WITH_MKLDNN
-  cfg->_use_mkldnn = true;
-#endif
 }
 
 void SetInput(std::vector<std::vector<PaddleTensor>> *inputs) {

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,6 @@ void SetConfig(AnalysisConfig *cfg) {`
`27`	`27`	`cfg->device = 0;`
`28`	`28`	`cfg->enable_ir_optim = true;`
`29`	`29`	`cfg->specify_input_name = true;`
`30`		`-#ifdef PADDLE_WITH_MKLDNN`
`31`		`- cfg->_use_mkldnn = true;`
`32`		`-#endif`
`33`	`30`	`}`
`34`	`31`
`35`	`32`	`void SetInput(std::vector<std::vector<PaddleTensor>> *inputs) {`