Skip to content
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.

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

[FleetExecutor] Move SendIntra to Carrier && Using BlockingQueue #38322

Merged
merged 1 commit into from
Dec 22, 2021

Conversation

LiYuRio
Copy link
Contributor

@LiYuRio LiYuRio commented Dec 21, 2021

PR types

Others

PR changes

Others

Describe

  • 将卡内消息传输的逻辑从MessageBus移动到Carrier
  • Interceptor的远程信箱复用BlockingQueue

截屏2021-12-21 下午7 21 58

@paddle-bot-old
Copy link

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

Copy link
Contributor

@wangxicoding wangxicoding left a comment

Choose a reason for hiding this comment

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

LGTM

const std::unordered_map<int64_t, std::string>& rank_to_addr,
const std::string& addr);

bool IsInit() const;

// called by Interceptor, send InterceptorMessage to dst
bool Send(const InterceptorMessage& interceptor_message);
bool Send(int64_t dst_rank, const InterceptorMessage& interceptor_message);
Copy link
Contributor

Choose a reason for hiding this comment

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

这个为啥要加dst_rank,不是从msg里面可以获取吗

Copy link
Contributor

@wangxicoding wangxicoding Dec 22, 2021

Choose a reason for hiding this comment

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

done,已获知


#if defined(PADDLE_WITH_DISTRIBUTE) && defined(PADDLE_WITH_PSCORE) && \
!defined(PADDLE_WITH_ASCEND_CL)
// send the message inter rank (dst is different rank with src)
bool SendInterRank(const InterceptorMessage& interceptor_message);
bool SendInterRank(int64_t dst_rank,
Copy link
Contributor

Choose a reason for hiding this comment

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

同上

Copy link
Contributor

@FeixLiu FeixLiu left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -29,26 +29,26 @@ class RuntimeGraph final {
public:
RuntimeGraph() = default;
~RuntimeGraph() = default;
const std::unordered_map<int64_t, TaskNode*>& intercepter_id_to_node() const {
return intercepter_id_to_node_;
const std::unordered_map<int64_t, TaskNode*>& interceptor_id_to_node() const {
Copy link
Contributor

Choose a reason for hiding this comment

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

😂

@wangxicoding wangxicoding merged commit ddc15a1 into PaddlePaddle:develop Dec 22, 2021
@LiYuRio LiYuRio deleted the dev_use_blockqueue branch December 31, 2021 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants