Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Conversation

@zrr1999
Copy link
Member

@zrr1999 zrr1999 commented Aug 16, 2022

Copy link
Member

@zhhsplendid zhhsplendid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

其他地方没有什么问题

@zrr1999
Copy link
Member Author

zrr1999 commented Aug 24, 2022

其他地方没有什么问题

好的,此部分已经修改完毕

# Conflicts: #	cinn/frontend/net_builder.cc #	cinn/frontend/net_builder.h
Copy link
Member

@zhhsplendid zhhsplendid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我没有什么问题了,但是这个PR可能因为别的PR合入,出现了conflict,可否按照Github CI地方的提示修复一下conflict,然后我可以approve和合入。

# Conflicts: #	cinn/frontend/net_builder_test.cc #	cinn/hlir/op/contrib/CMakeLists.txt
@zrr1999
Copy link
Member Author

zrr1999 commented Aug 29, 2022

我没有什么问题了,但是这个PR可能因为别的PR合入,出现了conflict,可否按照Github CI地方的提示修复一下conflict,然后我可以approve和合入。

好的,已经解决了conflict

@zrr1999 zrr1999 requested a review from zhhsplendid August 29, 2022 12:44
Copy link
Member

@zhhsplendid zhhsplendid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zhhsplendid zhhsplendid merged commit d39a210 into PaddlePaddle:develop Aug 30, 2022
@jiweibo jiweibo mentioned this pull request Sep 19, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

2 participants