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

【PaddlePaddle Hackathon No.75】add sort op #891

Merged
merged 65 commits into from
Sep 16, 2022
Merged

【PaddlePaddle Hackathon No.75】add sort op #891

merged 65 commits into from
Sep 16, 2022

Conversation

zrr1999
Copy link
Member

@zrr1999 zrr1999 commented Aug 19, 2022 •
edited
Loading

zhhsplendid
zhhsplendid reviewed Sep 7, 2022
View reviewed changes
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比较长，我先review一部分，runtime外的我review好了。runtime里增加的函数，我近期尽快review掉

cinn/frontend/net_builder.h Outdated Show resolved Hide resolved
cinn/frontend/net_builder.h Outdated Show resolved Hide resolved
cinn/hlir/op/contrib/sort.cc Outdated Show resolved Hide resolved
cinn/hlir/op/contrib/sort.cc Outdated Show resolved Hide resolved
cinn/hlir/op/contrib/sort.cc Show resolved Hide resolved
@zrr1999
modified
bd79ec5
@zrr1999
Merge branch 'develop' into sort
2ca7fb1 
# Conflicts:
#	cinn/frontend/net_builder_test.cc
#	cinn/hlir/op/contrib/CMakeLists.txt
@zrr1999
Copy link
Member Author

zrr1999 commented Sep 7, 2022

这个PR比较长，我先review一部分，runtime外的我review好了。runtime里增加的函数，我近期尽快review掉

好的，已经review的部分已经修改完毕

@zrr1999 zrr1999 requested a review from haozech September 9, 2022 07:57
@zrr1999 zrr1999 requested review from zhhsplendid and removed request for haozech September 14, 2022 08:36
@zrr1999
Merge branch 'develop' into sort
3b8a6b2 
# Conflicts:
#	cinn/frontend/net_builder.h
@zrr1999
fix bugs
209b333
@haozech
Copy link
Collaborator

haozech commented Sep 15, 2022

拉下develop分支解决下冲突，应该没有其他问题

@zrr1999
Merge branch 'develop' into sort
e83b9eb 
# Conflicts:
#	cinn/runtime/cuda/cinn_cuda_runtime_source.cuh
@zrr1999
Copy link
Member Author

zrr1999 commented Sep 15, 2022

拉下develop分支解决下冲突，应该没有其他问题

好的，我已经了冲突

haozech
haozech reviewed Sep 16, 2022
View reviewed changes
Copy link
Collaborator

@haozech haozech 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 approved these changes Sep 16, 2022
View reviewed changes
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 9a7bfda into PaddlePaddle:develop Sep 16, 2022
@zrr1999 zrr1999 mentioned this pull request Sep 18, 2022
Closed
@Shixiaowei02 Shixiaowei02 mentioned this pull request Feb 22, 2023
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@haozech haozech haozech left review comments

@zhhsplendid zhhsplendid zhhsplendid approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zrr1999 @zhhsplendid @haozech