Skip to content

[ThirdParty] Update gloo and remove local patch application - #79245

Merged
swgu98 merged 1 commit into
PaddlePaddle:developfrom
gouzil:codex/update-gloo-sync-remove-patches
Jun 4, 2026
Merged

swgu98 merged 1 commit into
PaddlePaddle:developfrom
gouzil:codex/update-gloo-sync-remove-patches

Conversation

@gouzil

@gouzil gouzil commented Jun 4, 2026 •

Copy link
Copy Markdown
Collaborator

PR Category

Environment Adaptation

PR Types

Bug fixes

Description

  • 将 third_party/gloo 更新到 PFCCLab/gloo paddle 分支最新提交 54953de0643a0977a63a79756510739145a681e6
  • 删除 patches/gloo 下三份本地 patch
  • 移除 cmake/external/gloo.cmake 中对 gloo patch 的套用逻辑

PFCCLab/gloo 已经同步了 Paddle 本地 patch 内容,因此 Paddle 侧不再需要在构建阶段额外 checkout tag 并套 patch。

cc: @ShigureNyako

相关链接:

是否引起精度变化

否

Copilot AI review requested due to automatic review settings June 4, 2026 09:10

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the vendored third_party/gloo dependency (PFCCLab/gloo paddle branch) and removes Paddle-side build-time patch application logic, based on the premise that the upstream fork now contains the previously maintained local patches.

Changes:

  • Removed three local gloo patch files under patches/gloo/.
  • Simplified cmake/external/gloo.cmake by deleting the PATCH_COMMAND flow (including the git checkout + patch steps) previously used during ExternalProject_Add.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

File Description
patches/gloo/types.h.patch Deleted local patch (no longer applied during build).
patches/gloo/linux.cc.patch Deleted local patch (no longer applied during build).
patches/gloo/device.cc.patch Deleted local patch (no longer applied during build).
cmake/external/gloo.cmake Removed gloo patch-application logic from the external build step.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@gouzil
gouzil requested review from SigureMo and swgu98 June 4, 2026 09:23
@SigureMo SigureMo changed the title Update gloo and remove local patch application [ThirdParty] Update gloo and remove local patch application Jun 4, 2026

@PaddlePaddle-bot PaddlePaddle-bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🤖 Paddle-CI-Agent | pr_review | 2026-06-04 17:39:15

📋 Review 摘要

PR 概述:将 third_party/gloo submodule 升级至 PFCCLab fork paddle 分支最新 commit,并移除 CMake 中的本地 patch 应用逻辑及三个 patch 文件。
变更范围:cmake/external/gloo.cmake、third_party/gloo(submodule)、patches/gloo/
影响面 Tag:[Environment Adaptation]

问题

未发现阻塞性问题。PR 规范问题在下面章节报,不要在这里重复。

📝 PR 规范检查

符合规范。PR Category / PR Types / Description / 是否引起精度变化四个必填项均已正确填写。

总体评价

变更逻辑清晰:旧方案在构建阶段将 gloo 源码 reset 到 v0.0.3 再 apply 3 个 patch,新方案直接使用已将这些 patch 合入的 PFCCLab fork commit,属于合理的上游同步维护策略。CMake 中无遗留引用,patch 文件删除干净,可以合入。

@ShigureNyako

Copy link
Copy Markdown
Contributor

/re-run all-failed

@swgu98
swgu98 merged commit d9242d5 into PaddlePaddle:develop Jun 4, 2026
139 of 145 checks passed
@SigureMo
SigureMo deleted the codex/update-gloo-sync-remove-patches branch June 4, 2026 15:15
@paddle-bot

paddle-bot Bot commented Jul 13, 2026

Copy link
Copy Markdown

你的PR提交成功,感谢你对开源项目的贡献!
请关注后续CI自动化测试结果,详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

@paddle-bot paddle-bot Bot added the contributor External developers label Jul 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

contributor External developers skip-ci: h-ci

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants