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.

Sign up for GitHub

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

Jump to bottom

Fixed pull_graph_list bug; add test case for pull_graph_list by step #8

Merged
merged 3 commits into from
Mar 22, 2021
Merged

Fixed pull_graph_list bug; add test case for pull_graph_list by step #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
009cc03
Merge pull request #9 from seemingwang/develop
Yelrose 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
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
2 changes: 1 addition & 1 deletion paddle/fluid/distributed/service/graph_brpc_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ int32_t GraphBrpcService::pull_graph_list(Table *table,
int step = *(int *)(request.params(2).c_str());
std::unique_ptr<char[]> buffer;
int actual_size;
table->pull_graph_list(start, size, buffer, actual_size, step, true);
table->pull_graph_list(start, size, buffer, actual_size, true, step);
cntl->response_attachment().append(buffer.get(), actual_size);
return 0;
}
Expand Down
28 changes: 25 additions & 3 deletions paddle/fluid/distributed/test/graph_node_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@ std::string nodes[] = {
std::string("item\t45\t0.21"), std::string("item\t145\t0.21"),
std::string("item\t112\t0.21"), std::string("item\t48\t0.21"),
std::string("item\t247\t0.21"), std::string("item\t111\t0.21"),
std::string("item\t45\t0.21"), std::string("item\t145\t0.21"),
std::string("item\t122\t0.21"), std::string("item\t48\t0.21"),
std::string("item\t247\t0.21"), std::string("item\t111\t0.21")};
std::string("item\t46\t0.21"), std::string("item\t146\t0.21"),
std::string("item\t122\t0.21"), std::string("item\t49\t0.21"),
std::string("item\t248\t0.21"), std::string("item\t113\t0.21")};
char node_file_name[] = "nodes.txt";

void prepare_file(char file_name[], bool load_edge) {
Expand Down Expand Up @@ -373,6 +373,7 @@ void RunBrpcPushSparse() {
// client2.load_edge_file(std::string("user2item"), std::string(file_name),
// 0);
nodes.clear();

nodes = client1.pull_graph_list(std::string("user"), 0, 1, 4, 1);

for (auto g : nodes) {
Expand All @@ -381,6 +382,27 @@ void RunBrpcPushSparse() {
std::cout << "node_ids: " << nodes[0].get_id() << std::endl;
ASSERT_EQ(nodes[0].get_id(), 59);
nodes.clear();

// Test Pull by step


std::unordered_set<uint64_t> count_item_nodes;
// pull by step 2
for(int test_step=1; test_step < 4 ; test_step ++) {
count_item_nodes.clear();
std::cout << "check pull graph list by step " << test_step << std::endl;
for(int server_id = 0; server_id < 2; server_id ++) {
for(int start_step = 0; start_step < test_step; start_step ++) {
nodes = client1.pull_graph_list(std::string("item"), server_id, start_step, 12, test_step);
for (auto g : nodes) {
count_item_nodes.insert(g.get_id());
}
nodes.clear();
}
}
ASSERT_EQ(count_item_nodes.size(), 12);
}

vs = client1.batch_sample_neighboors(std::string("user2item"),
std::vector<uint64_t>(1, 96), 4);
ASSERT_EQ(vs[0].size(), 3);
Expand Down