Skip to content

[Cherry-pick to 3.0beta]fix sd1.5 with cinn #64921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qingqing01 merged 1 commit into from
Jun 6, 2024
Merged

[Cherry-pick to 3.0beta]fix sd1.5 with cinn #64921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions paddle/fluid/pir/dialect/operator/interface/layout_transformation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <>
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/pir/dialect/operator/interface/layout_transformation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down