Merge pull request #15504 from NHZlX/fix_conv2d_fusion

Add check: conv_fusion op runs with cudnn version > 7100 .

Merge pull request #15504 from NHZlX/fix_conv2d_fusion
Add check: conv_fusion op runs with cudnn version > 7100 .
a7ba07d7 · Zhaolong Xing · GitHub · efce2567 · 96413249 · a7ba07d7
隐藏空白更改
内联并排

Showing with 10 addition and 7 deletion

paddle/fluid/inference/api/paddle_pass_builder.h paddle/fluid/inference/api/paddle_pass_builder.h +10 -7

未找到文件。
--- a/paddle/fluid/inference/api/paddle_pass_builder.h
+++ b/paddle/fluid/inference/api/paddle_pass_builder.h
@@ -154,13 +154,16 @@ class GpuPassStrategy : public PassStrategy {
 public:
  GpuPassStrategy() : PassStrategy({}) {
    passes_.assign({
-        "infer_clean_graph_pass",                    //
+      "infer_clean_graph_pass",                        //
-        "conv_affine_channel_fuse_pass",             //
+          "conv_affine_channel_fuse_pass",             //
-        "conv_eltwiseadd_affine_channel_fuse_pass",  //
+          "conv_eltwiseadd_affine_channel_fuse_pass",  //
-        "conv_bn_fuse_pass",                         //
+          "conv_bn_fuse_pass",                         //
-        "conv_elementwise_add_act_fuse_pass",        //
+#if CUDNN_VERSION >= 7100  // To run conv_fusion, the version of cudnn must be
-        "conv_elementwise_add2_act_fuse_pass",       //
+                           // guaranteed at least v7
-        "conv_elementwise_add_fuse_pass",            //
+          "conv_elementwise_add_act_fuse_pass",   //
+          "conv_elementwise_add2_act_fuse_pass",  //
+          "conv_elementwise_add_fuse_pass",       //
+#endif
    });
    for (int i = 6; i >= 3; i--) {