merge confict, test=develop

6 years ago · b236091e89
parent facd95e6e3
commit b236091e89
1 changed files with 1 additions and 1 deletions
--- a/paddle/fluid/inference/api/paddle_pass_builder.cc
+++ b/paddle/fluid/inference/api/paddle_pass_builder.cc
@ -132,9 +132,9 @@ CpuPassStrategy::CpuPassStrategy() : PassStrategy({}) {
      "conv_bn_fuse_pass",             //
      "conv_eltwiseadd_bn_fuse_pass",  //
      "is_test_pass",                  //
-      "identity_scale_op_clean_pass",  //
      "runtime_context_cache_pass",    //
  });
+
  use_gpu_ = false;
 }