add op_compat for the seqpool_cvm_concat_fuse_pass, test=develop

PaddlePaddle · Jun 21, 2021 · 41bfad5 · 41bfad5
1 parent 009a163
commit 41bfad5
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 1 deletion.
diff --git a/paddle/fluid/framework/ir/seqpool_cvm_concat_fuse_pass.cc b/paddle/fluid/framework/ir/seqpool_cvm_concat_fuse_pass.cc
@@ -52,6 +52,48 @@ static void GetConcatNodes(ir::Graph* graph, std::vector<Node*>* concat_nodes) {
 }
 }  // anonymous namespace
 
+SeqPoolCVMConcatFusePass::SeqPoolCVMConcatFusePass() {
+  AddOpCompat(OpCompat("sequence_pool"))
+      .AddInput("X")
+      .IsTensor()
+      .End()
+      .AddOutput("Out")
+      .IsTensor()
+      .End()
+      .AddOutput("MaxIndex")
+      .End()
+      .AddAttr("pooltype")
+      .End()
+      .AddAttr("pad_value")
+      .End();
+  AddOpCompat(OpCompat("cvm"))
+      .AddInput("X")
+      .IsTensor()
+      .End()
+      .AddInput("CVM")
+      .IsTensor()
+      .End()
+      .AddOutput("Y")
+      .IsTensor()
+      .End()
+      .AddAttr("use_cvm")
+      .IsBoolEQ(true)
+      .End();
+  AddOpCompat(OpCompat("concat"))
+      .AddInput("X")
+      .IsTensor()
+      .End()
+      .AddInput("AxisTensor")
+      .IsTensor()
+      .End()
+      .AddOutput("Out")
+      .IsTensor()
+      .End()
+      .AddAttr("axis")
+      .IsNumGE(1)
+      .End();
+}
+
 void SeqPoolCVMConcatFusePass::ApplyImpl(ir::Graph* graph) const {
   FusePassBase::Init("seqpool_cvm_concat_fuse", graph);
   std::vector<Node*> concat_nodes;

diff --git a/paddle/fluid/framework/ir/seqpool_cvm_concat_fuse_pass.h b/paddle/fluid/framework/ir/seqpool_cvm_concat_fuse_pass.h
@@ -44,7 +44,7 @@ class Graph;
 
 class SeqPoolCVMConcatFusePass : public FusePassBase {
  public:
-  virtual ~SeqPoolCVMConcatFusePass() {}
+  SeqPoolCVMConcatFusePass();
 
  protected:
   void ApplyImpl(ir::Graph* graph) const override;

diff --git a/paddle/fluid/operators/compat/cvm.pbtxt b/paddle/fluid/operators/compat/cvm.pbtxt
@@ -0,0 +1,39 @@
+type: "cvm"
+def {
+  inputs {
+    name: "X"
+  }
+  inputs {
+    name: "CVM"
+  }
+  outputs {
+    name: "Y"
+  }
+  attrs {
+    name: "use_cvm"
+    type: BOOLEAN
+  }
+}
+extra {
+  attrs {
+    name: "op_role"
+    type: INT
+  }
+  attrs {
+    name: "op_role_var"
+    type: STRINGS
+  }
+  attrs {
+    name: "op_namescope"
+    type: STRING
+  }
+  attrs {
+    name: "op_callstack"
+    type: STRINGS
+  }
+  attrs {
+    name: "op_device"
+    type: STRING
+  }
+}
+
diff --git a/paddle/fluid/operators/compat/sequence_pool.pbtxt b/paddle/fluid/operators/compat/sequence_pool.pbtxt
@@ -0,0 +1,47 @@
+type: "sequence_pool"
+def {
+  inputs {
+    name: "X"
+  }
+  outputs {
+    name: "Out"
+  }
+  outputs {
+    name: "MaxIndex"
+  }
+  attrs {
+    name: "pooltype"
+    type: STRING
+  }
+  attrs {
+    name: "pad_value"
+    type: FLOAT
+  }
+}
+extra {
+  attrs {
+    name: "is_test"
+    type: BOOLEAN
+  }
+  attrs {
+    name: "op_role"
+    type: INT
+  }
+  attrs {
+    name: "op_role_var"
+    type: STRINGS
+  }
+  attrs {
+    name: "op_namescope"
+    type: STRING
+  }
+  attrs {
+    name: "op_callstack"
+    type: STRINGS
+  }
+  attrs {
+    name: "op_device"
+    type: STRING
+  }
+}
+