From b236091e89f64ecc9493c43f9772280a1f35a8ff Mon Sep 17 00:00:00 2001
From: lujun <lujun315023@126.com>
Date: Wed, 3 Apr 2019 18:16:53 +0800
Subject: [PATCH] merge confict, test=develop

---
 paddle/fluid/inference/api/paddle_pass_builder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paddle/fluid/inference/api/paddle_pass_builder.cc b/paddle/fluid/inference/api/paddle_pass_builder.cc
index 87e02a02cae..e765c078aa8 100644
--- 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;
 }
 
-- 
GitLab