merge confict, test=develop

b236091e · lujun · facd95e6 · b236091e
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

paddle/fluid/inference/api/paddle_pass_builder.cc paddle/fluid/inference/api/paddle_pass_builder.cc +1 -1

未找到文件。
--- 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;
 }