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

Gloo update #45584

Merged
merged 40 commits into from
Sep 15, 2022
Merged
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
d9bb853
back fl
ziyoujiyi Mar 25, 2022
6073452
delete ssl cert
ziyoujiyi Mar 25, 2022
66fa8c8
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 25, 2022
4bb3d3f
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 25, 2022
7a02e84
.
ziyoujiyi Mar 25, 2022
883b55a
make warning
ziyoujiyi Mar 26, 2022
f917402
.
ziyoujiyi Mar 26, 2022
fa4ab2e
unittest paral degree
ziyoujiyi Mar 28, 2022
a129afc
solve unittest
ziyoujiyi Mar 28, 2022
a54e061
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 29, 2022
ed7e38f
heter & multi cloud commm ready
ziyoujiyi Mar 29, 2022
3e86455
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 29, 2022
b5a34fc
.
ziyoujiyi Mar 29, 2022
0e4b998
Merge branch 'develop' of https://github.com/ziyoujiyi/Paddle into de…
ziyoujiyi Mar 29, 2022
eeec283
.
ziyoujiyi Mar 29, 2022
d293d97
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 29, 2022
c1759b5
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 30, 2022
d9aa775
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Mar 31, 2022
7105730
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Apr 2, 2022
73ea318
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Apr 11, 2022
7dc2091
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Apr 19, 2022
2019a5f
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Apr 24, 2022
f22bbcd
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Apr 26, 2022
5019c73
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi May 9, 2022
6c76994
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi May 11, 2022
2469beb
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi May 25, 2022
ff90d84
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jun 14, 2022
cb424b8
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 1, 2022
38ef399
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 11, 2022
9081f5d
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 11, 2022
4226f19
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 14, 2022
fd269f8
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 25, 2022
b7bc6ba
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 28, 2022
1cda04d
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Jul 28, 2022
deb236d
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Aug 3, 2022
75a4984
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Aug 9, 2022
05b0c7d
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Aug 16, 2022
59ebcb5
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Aug 22, 2022
654928d
Merge branch 'PaddlePaddle:develop' into develop
ziyoujiyi Aug 30, 2022
ab2b007
fix gloo compile warning
ziyoujiyi Aug 30, 2022
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
4 changes: 2 additions & 2 deletions cmake/external/gloo.cmake
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ set(GLOO_LIBRARY_DIR
"${GLOO_INSTALL_DIR}/lib"
CACHE PATH "gloo library directory." FORCE)
# As we add extra features for gloo, we use the non-official repo
set(GLOO_REPOSITORY ${GIT_URL}/sandyhouse/gloo.git)
set(GLOO_TAG v0.0.2)
set(GLOO_REPOSITORY ${GIT_URL}/ziyoujiyi/gloo.git)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why we don't use the original branch of gloo?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

当前框架使用的gloo版本从 2020.1.9 commit345 拉过来的,然后新增了自定义功能,共 8 个 commit,涉及改动文件数20+,代码行数 1000+,落后官方 repo 53 个 commit,使用官方 repo 工作量估计是一个月,之前讨论的方案是先临时修复

set(GLOO_TAG v0.0.3)
set(GLOO_LIBRARIES
"${GLOO_INSTALL_DIR}/lib/libgloo.a"
CACHE FILEPATH "gloo library." FORCE)
Expand Down