remove OperationInterface

zyfncg · Aug 9, 2023 · 43e1f02 · 43e1f02
1 parent a1c1e3f
commit 43e1f02
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 38 deletions.
diff --git a/paddle/ir/pattern_rewrite/drr/api/match_context.cc b/paddle/ir/pattern_rewrite/drr/api/match_context.cc
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "paddle/ir/pattern_rewrite/drr/api/match_context.h"
+#include "paddle/ir/pattern_rewrite/drr/ir_operation.h"
 #include "paddle/ir/pattern_rewrite/drr/match_context_impl.h"
 
 namespace ir {
@@ -26,7 +27,7 @@ const TensorInterface& MatchContext::Tensor(
   return impl_->Tensor(tensor_name);
 }
 
-const OperationInterface& MatchContext::Operation(
+const IrOperation& MatchContext::Operation(
     const std::string& op_name) const {
   return impl_->Operation(op_name);
 }

diff --git a/paddle/ir/pattern_rewrite/drr/api/match_context.h b/paddle/ir/pattern_rewrite/drr/api/match_context.h
@@ -18,7 +18,7 @@
 #include <string>
 
 #include "paddle/ir/pattern_rewrite/drr/api/tensor_interface.h"
-#include "paddle/ir/pattern_rewrite/drr/api/operation_interface.h"
+#include "paddle/ir/pattern_rewrite/drr/ir_operation.h"
 
 namespace ir {
 namespace drr {
@@ -32,7 +32,7 @@ class MatchContext final {
 
   const TensorInterface& Tensor(const std::string& tensor_name) const;
 
-  const OperationInterface& Operation(const std::string& op_name) const;
+  const IrOperation& Operation(const std::string& op_name) const;
 
   template <typename T>
   T Attr(const std::string& attr_name) const;

diff --git a/paddle/ir/pattern_rewrite/drr/api/operation_interface.h b/paddle/ir/pattern_rewrite/drr/api/operation_interface.h
diff --git a/paddle/ir/pattern_rewrite/drr/ir_operation.h b/paddle/ir/pattern_rewrite/drr/ir_operation.h
@@ -15,16 +15,15 @@
 #pragma once
 
 #include "paddle/ir/core/operation.h"
-#include "paddle/ir/pattern_rewrite/drr/api/operation_interface.h"
 
 namespace ir {
 namespace drr {
 
-class IrOperation : public OperationInterface {
+class IrOperation {
  public:
   explicit IrOperation(ir::Operation* op) : op_(op) {}
 
-  ir::Operation* Operation() const override { return op_; }
+  ir::Operation* get() const { return op_; }
 
  private:
   ir::Operation* op_;

diff --git a/paddle/ir/pattern_rewrite/drr/match_context_impl.h b/paddle/ir/pattern_rewrite/drr/match_context_impl.h
@@ -18,7 +18,6 @@
 #include <unordered_map>
 
 #include "paddle/ir/core/builtin_attribute.h"
-#include "paddle/ir/pattern_rewrite/drr/api/operation_interface.h"
 #include "paddle/ir/pattern_rewrite/drr/api/tensor_interface.h"
 #include "paddle/ir/pattern_rewrite/drr/ir_operation.h"
 #include "paddle/ir/pattern_rewrite/drr/ir_tensor.h"
@@ -49,7 +48,7 @@ class MatchContextImpl final {
     return *tensor_map_.at(tensor_name);
   }
 
-  const OperationInterface& Operation(const std::string& op_name) const {
+  const IrOperation& Operation(const std::string& op_name) const {
     return *operation_map_.at(op_name);
   }