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

recover capacity check #34478

Merged
merged 167 commits into from
Jul 29, 2021
Merged
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
9d24726
graph engine demo
seemingwang Feb 25, 2021
7753f38
upload unsaved changes
seemingwang Feb 26, 2021
5fa66ab
fix dependency error
seemingwang Feb 27, 2021
3e12386
fix shard_num problem
seemingwang Feb 28, 2021
acacce0
py client
seemingwang Mar 2, 2021
3f32bf1
remove lock and graph-type
seemingwang Mar 9, 2021
dda5291
Merge pull request #2 from seemingwang/develop
Yelrose Mar 11, 2021
44df9ac
add load direct graph
Yelrose Mar 11, 2021
c8e67b8
add load direct graph
Yelrose Mar 11, 2021
7320994
add load direct graph
Yelrose Mar 11, 2021
f4ea973
batch random_sample
WeiyueSu Mar 11, 2021
492e551
batch_sample_k
WeiyueSu Mar 11, 2021
193203f
fix num_nodes size
WeiyueSu Mar 11, 2021
b55bf42
batch brpc
WeiyueSu Mar 11, 2021
102ae95
batch brpc
WeiyueSu Mar 11, 2021
3106b2a
add test
WeiyueSu Mar 11, 2021
51ed7d8
add test
WeiyueSu Mar 11, 2021
94025b9
Merge pull request #1 from Yelrose/develop
seemingwang Mar 12, 2021
e087485
add load_nodes; change add_node function
Yelrose Mar 12, 2021
455e2a0
Merge pull request #3 from seemingwang/develop
Yelrose Mar 12, 2021
c588c96
change sample return type to pair
seemingwang Mar 12, 2021
391b8e5
merge
Yelrose Mar 15, 2021
2dc7ebf
resolve conflict
Yelrose Mar 15, 2021
f1ea3ac
Merge branch 'develop' of https://github.com/Yelrose/Paddle into develop
Yelrose Mar 15, 2021
e359135
resolved conflict
Yelrose Mar 15, 2021
a4e8939
resolved conflict
Yelrose Mar 15, 2021
290840f
resolved conflict
Yelrose Mar 15, 2021
d98be69
separate server and client
seemingwang Mar 15, 2021
db6ee86
merge pair type
WeiyueSu Mar 15, 2021
550a23f
resolved conflict
Yelrose Mar 15, 2021
4a7327d
merge separate
WeiyueSu Mar 15, 2021
abb0ee0
fix
WeiyueSu Mar 15, 2021
2feadfe
resolved conflict
Yelrose Mar 15, 2021
ba57877
Merge pull request #3 from Yelrose/develop
seemingwang Mar 15, 2021
dbfa6ac
fixed segment fault; high-level VLOG for load edges and load nodes
Yelrose Mar 15, 2021
92e0b2c
Merge branch 'develop' into swy
WeiyueSu Mar 15, 2021
583e8de
random_sample return 0
WeiyueSu Mar 15, 2021
32558de
rm useless loop
WeiyueSu Mar 15, 2021
8643616
test:load edge
WeiyueSu Mar 15, 2021
a21d599
fix ret -1
WeiyueSu Mar 15, 2021
dd14309
test: rm sample
WeiyueSu Mar 15, 2021
86ff4d9
rm sample
WeiyueSu Mar 15, 2021
2abf38c
Merge pull request #2 from WeiyueSu/batch_sample_k
seemingwang Mar 16, 2021
7a14737
random_sample return future
WeiyueSu Mar 16, 2021
b6cc9f0
random_sample return int
WeiyueSu Mar 16, 2021
2a70bd8
test fake node
WeiyueSu Mar 16, 2021
eb53bfa
Merge pull request #4 from WeiyueSu/batch_sample_k
seemingwang Mar 16, 2021
1334f2c
Merge pull request #6 from seemingwang/develop
Yelrose Mar 16, 2021
6a28d02
fixed here
Yelrose Mar 16, 2021
b08a36f
merge conflict
Yelrose Mar 16, 2021
1dfc021
memory leak
seemingwang Mar 16, 2021
832cab8
remove test code
seemingwang Mar 16, 2021
6c38fa0
Merge pull request #7 from seemingwang/develop
Yelrose Mar 17, 2021
bf41ef9
fix return problem
seemingwang Mar 17, 2021
ff54377
add common_graph_table
Yelrose Mar 18, 2021
efeded9
random sample node &test & change data-structure from linkedList to v…
seemingwang Mar 18, 2021
eb89064
Merge pull request #8 from seemingwang/develop
Yelrose Mar 18, 2021
5d53dfe
add common_graph_table
Yelrose Mar 18, 2021
7fb7407
Merge branch 'develop' of https://github.com/Yelrose/Paddle into develop
Yelrose Mar 18, 2021
e30dfa5
sample with srand
WeiyueSu Mar 18, 2021
77b2351
add node_types
Yelrose Mar 18, 2021
6fdb5c9
optimize nodes sample
seemingwang Mar 18, 2021
217b17f
recover test
seemingwang Mar 18, 2021
90f30ce
random sample
WeiyueSu Mar 19, 2021
ad66425
Merge branch 'develop' into develop
Yelrose Mar 19, 2021
ec2555a
destruct weighted sampler
WeiyueSu Mar 19, 2021
6627904
Merge pull request #6 from Yelrose/develop
seemingwang Mar 19, 2021
46dc17f
Merge pull request #5 from WeiyueSu/sample
seemingwang Mar 19, 2021
31d411a
GraphEdgeBlob
WeiyueSu Mar 19, 2021
3ace545
WeightedGraphEdgeBlob to GraphEdgeBlob
WeiyueSu Mar 20, 2021
9e3b8b9
WeightedGraphEdgeBlob to GraphEdgeBlob
WeiyueSu Mar 20, 2021
1c067db
Merge pull request #7 from WeiyueSu/sample
seemingwang Mar 20, 2021
7d2dd6e
pybind sample nodes api
seemingwang Mar 21, 2021
56ed7ca
Merge branch 'develop' of https://github.com/seemingwang/Paddle into …
seemingwang Mar 21, 2021
009cc03
Merge pull request #9 from seemingwang/develop
Yelrose Mar 22, 2021
09667d1
pull nodes with step
seemingwang Mar 22, 2021
67aabdb
Merge pull request #10 from seemingwang/develop
Yelrose Mar 22, 2021
f861faa
fixed pull_graph_list bug; add test for pull_graph_list by step
Yelrose Mar 22, 2021
5f6c168
Merge pull request #8 from Yelrose/develop
seemingwang Mar 22, 2021
95676f7
add graph table;name
Yelrose Mar 22, 2021
d45fb2e
Merge pull request #11 from seemingwang/develop
Yelrose Mar 22, 2021
a41ee8b
add graph table;name
Yelrose Mar 22, 2021
aebd753
Merge branch 'develop' of https://github.com/Yelrose/Paddle into develop
Yelrose Mar 22, 2021
2da46ad
add pybind
Yelrose Mar 22, 2021
7d51520
add pybind
Yelrose Mar 22, 2021
3e68780
Merge pull request #9 from Yelrose/develop
seemingwang Mar 22, 2021
c0284fe
add FeatureNode
WeiyueSu Mar 22, 2021
fe4afed
add FeatureNode
WeiyueSu Mar 22, 2021
20ebad3
Merge pull request #12 from WeiyueSu/FeatureNode
Yelrose Mar 23, 2021
e96c14b
Merge pull request #10 from WeiyueSu/FeatureNode
seemingwang Mar 23, 2021
9d3188a
add FeatureNode Serialize
Yelrose Mar 23, 2021
c7e47f1
add FeatureNode Serialize
Yelrose Mar 23, 2021
1b4b50c
Merge pull request #13 from seemingwang/develop
Yelrose Mar 23, 2021
aa1dd6b
Merge pull request #11 from Yelrose/develop
seemingwang Mar 23, 2021
a81a214
get_feat_node
WeiyueSu Mar 24, 2021
f4a18d8
avoid local rpc
seemingwang Mar 24, 2021
09fc145
fix get_node_feat
Mar 24, 2021
ad30c1c
fix get_node_feat
Mar 24, 2021
8f2a1bc
add feature node to pybind
seemingwang Mar 24, 2021
4a32d64
remove log
seemingwang Mar 24, 2021
959198a
merge
WeiyueSu Mar 24, 2021
bb48ece
Merge pull request #12 from WeiyueSu/FeatureNode
seemingwang Mar 24, 2021
6f4223c
get_node_feat return py:bytes
WeiyueSu Mar 24, 2021
74d2167
Merge pull request #13 from WeiyueSu/FeatureNode
seemingwang Mar 25, 2021
578e305
Merge pull request #14 from WeiyueSu/FeatureNode
seemingwang Mar 25, 2021
5be0c8e
merge develop with graph_engine
seemingwang Mar 25, 2021
1181212
fix threadpool.h head
seemingwang Mar 25, 2021
ffd07a2
fix
Liwb5 Mar 26, 2021
527379f
Merge pull request #15 from Liwb5/develop
seemingwang Mar 26, 2021
1d87155
fix typo
Liwb5 Mar 26, 2021
9a47d1d
Merge pull request #16 from Liwb5/develop
seemingwang Mar 26, 2021
eb8d992
merge test
seemingwang Mar 26, 2021
f95b4d2
merge graph_engine
seemingwang Mar 26, 2021
af03ec9
resolve conflicts
seemingwang Mar 26, 2021
49e2154
resolve conflict
seemingwang Mar 27, 2021
0f2e0b1
fix conflict
seemingwang Mar 27, 2021
2c3515a
recover lost content
seemingwang Mar 27, 2021
8826468
fix pybind of FeatureNode
Liwb5 Mar 28, 2021
2cb2eaf
Merge pull request #17 from Liwb5/develop
seemingwang Mar 28, 2021
5b2393b
recover cmake
seemingwang Mar 28, 2021
bdd9404
recover tools
seemingwang Mar 28, 2021
88cd27a
Merge remote-tracking branch 'origin/graph_engine1.0' into develop
seemingwang Mar 28, 2021
6535661
resolve conflict
seemingwang Mar 29, 2021
63d7fdc
resolve linking problem
seemingwang Mar 29, 2021
0280122
resolve conflict
seemingwang Mar 29, 2021
fe5eb72
code style
seemingwang Mar 29, 2021
6f0b2e1
change test_server port
seemingwang Mar 29, 2021
ed9a69f
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang Mar 29, 2021
c705c84
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang Mar 30, 2021
771be00
fix code problems
seemingwang Mar 30, 2021
1a3013a
remove shard_num config
seemingwang Mar 30, 2021
bd6b545
remove redundent threads
seemingwang Mar 31, 2021
a768899
optimize start server
seemingwang Apr 1, 2021
085bca6
remove logs
seemingwang Apr 1, 2021
3b44e5a
fix code problems
seemingwang Apr 1, 2021
0f85b95
fix code problems by reviewers' suggestions
seemingwang Apr 1, 2021
2afea69
move graph files into a folder
seemingwang Apr 6, 2021
ceebbf9
resolve conflicts
seemingwang Apr 6, 2021
a537778
Merge branch 'develop' into develop
seiriosPlus Apr 7, 2021
06c6c9b
code style change
seemingwang Apr 7, 2021
f291ea0
remove graph operations from base table
seemingwang Apr 7, 2021
d4d4e1a
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang Apr 14, 2021
59fa614
optimize get_feat function of graph engine
seemingwang Apr 14, 2021
7f5c835
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang Apr 21, 2021
faadcba
fix long long count problem
seemingwang Apr 21, 2021
618b7ce
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang Apr 26, 2021
7ced015
remove redandunt graph files
seemingwang May 15, 2021
20023e9
remove unused shell
seemingwang May 18, 2021
df5c83c
resolve conflict
seemingwang May 18, 2021
e9a718d
recover dropout_op_pass.h
seemingwang May 18, 2021
da7be7d
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang May 20, 2021
5b07c6c
fix potential stack overflow when request number is too large & node …
seemingwang May 22, 2021
d66d648
when sample k is larger than neigbor num, return directly
Liwb5 Jul 8, 2021
2037c51
using random seed generator of paddle to speed up
Liwb5 Jul 9, 2021
fc74f83
Merge pull request #18 from Liwb5/engine2.0
seemingwang Jul 11, 2021
d743606
fix bug of random sample k
Liwb5 Jul 12, 2021
0a4a081
Merge pull request #19 from Liwb5/engine2.0
seemingwang Jul 12, 2021
4ffe97b
Merge remote branch 'upstream/develop' into develop
seemingwang Jul 12, 2021
4f32d9b
Merge remote branch 'origin/develop' into develop
seemingwang Jul 12, 2021
4cfea1f
fix code style
seemingwang Jul 12, 2021
6087b28
fix code style
seemingwang Jul 12, 2021
960f575
Merge remote-tracking branch 'upstream/develop' into develop
seemingwang Jul 28, 2021
a0982ae
fix blocking_queue problem
seemingwang Jul 28, 2021
fdac4b6
fix style
seemingwang Jul 28, 2021
dfdfc05
fix
seemingwang Jul 28, 2021
4308f91
recover capacity check
seemingwang Jul 29, 2021
f73d6c4
fix style
seemingwang Jul 29, 2021
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
6 changes: 5 additions & 1 deletion paddle/fluid/distributed/service/communicator.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ using Variable = framework::Variable;
template <typename T>
class BlockingQueue {
public:
explicit BlockingQueue(size_t capacity) : capacity_(capacity) {}
explicit BlockingQueue(size_t capacity) : capacity_(capacity) {
PADDLE_ENFORCE_GT(capacity_, 0,
platform::errors::InvalidArgument(
"The capacity must be greater than 0."));
}

bool Push(const T &elem) {
std::unique_lock<std::mutex> lock(mutex_);
Expand Down