From 6762d9b88f75e7a67558862814e728445e0ddcd7 Mon Sep 17 00:00:00 2001
From: kangguangli <kangguangli@hotmail.com>
Date: Wed, 5 Jun 2024 15:46:20 +0800
Subject: [PATCH] fix sd1.5 with cinn (#64896)

---
 .../dialect/operator/interface/layout_transformation.cc  | 9 ++-------
 .../dialect/operator/interface/layout_transformation.hpp | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/paddle/fluid/pir/dialect/operator/interface/layout_transformation.cc b/paddle/fluid/pir/dialect/operator/interface/layout_transformation.cc
index 53c71c3fa0122e..cd3f0de0070216 100644
--- a/paddle/fluid/pir/dialect/operator/interface/layout_transformation.cc
+++ b/paddle/fluid/pir/dialect/operator/interface/layout_transformation.cc
@@ -104,13 +104,8 @@ common::DataLayout PreferLayoutImpl<Conv2dOp>(pir::Operation* op) {
 }
 
 template <>
-std::vector<pir::Value> RelevantInputsImpl<Conv2dOp>(pir::Operation* op) {
-  // Note(lyk): We exhibit the layout transformation for filter of conv2d
-  // due to issues with its infermeta and kernel not functioning
-  // properly in NHWC layout. However, if the FLAGS_manually_trans_conv_filter
-  // is enabled, the transfer_layout_pass can also operate correctly.
-  auto concrete_op = op->dyn_cast<Conv2dOp>();
-  return {concrete_op.input()};
+bool CanBeModifiedImpl<Conv2dOp>(pir::Operation* op) {
+  return false;
 }
 
 template <>
diff --git a/paddle/fluid/pir/dialect/operator/interface/layout_transformation.hpp b/paddle/fluid/pir/dialect/operator/interface/layout_transformation.hpp
index fe0f7b440772e3..cb4767498bf237 100644
--- a/paddle/fluid/pir/dialect/operator/interface/layout_transformation.hpp
+++ b/paddle/fluid/pir/dialect/operator/interface/layout_transformation.hpp
@@ -109,7 +109,7 @@ OVERLOAD_CAN_BE_MODIFIED(FusedConv2dAddActOp);
 
 class Conv2dOp;
 OVERLOAD_PREFER_LAYOUT(Conv2dOp);
-OVERLOAD_RELEVANT_INPUTS(Conv2dOp);
+OVERLOAD_CAN_BE_MODIFIED(Conv2dOp);
 OVERLOAD_REWRITE_BY_LAYOUT(Conv2dOp);
 
 class GroupNormOp;