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

[GPUGraph] Fix num #104

Merged
merged 1 commit into from
Sep 9, 2022
Merged

[GPUGraph] Fix num #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions paddle/fluid/framework/data_feed.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ int GraphDataGenerator::FillInferBuf() {
auto gpu_graph_ptr = GraphGpuWrapper::GetInstance();
auto &global_infer_node_type_start =
gpu_graph_ptr->global_infer_node_type_start_[gpuid_];
auto &infer_cursor = gpu_graph_ptr->infer_cursor_;
auto &infer_cursor = gpu_graph_ptr->infer_cursor_[thread_id_];
total_row_ = 0;
if (infer_cursor < h_device_keys_len_.size()) {
if (global_infer_node_type_start[infer_cursor] >=
Expand Down Expand Up @@ -957,13 +957,13 @@ int GraphDataGenerator::FillWalkBuf() {
auto &node_type_start = gpu_graph_ptr->node_type_start_[gpuid_];
auto &finish_node_type = gpu_graph_ptr->finish_node_type_[gpuid_];
auto &type_to_index = gpu_graph_ptr->get_graph_type_to_index();

auto& cursor = gpu_graph_ptr->cursor_[thread_id_];
size_t node_type_len = first_node_type.size();
int remain_size =
buf_size_ - walk_degree_ * once_sample_startid_len_ * walk_len_;

while (i <= remain_size) {
int cur_node_idx = cursor_ % node_type_len;
int cur_node_idx = cursor % node_type_len;
int node_type = first_node_type[cur_node_idx];
auto &path = meta_path[cur_node_idx];
size_t start = node_type_start[node_type];
Expand All @@ -988,13 +988,10 @@ int GraphDataGenerator::FillWalkBuf() {
if (finish_node_type.size() == node_type_start.size()) {
break;
}
cursor_ += 1;
cursor += 1;
continue;
}

VLOG(2) << "i = " << i << " buf_size_ = " << buf_size_
<< " tmp_len = " << tmp_len << " cursor = " << cursor_
<< " once_max_sample_keynum = " << once_max_sample_keynum;
VLOG(2) << "gpuid = " << gpuid_ << " path[0] = " << path[0];
uint64_t *cur_walk = walk + i;

Expand All @@ -1009,10 +1006,13 @@ int GraphDataGenerator::FillWalkBuf() {
int step = 1;
VLOG(2) << "sample edge type: " << path[0] << " step: " << 1;
jump_rows_ = sample_res.total_sample_size;
VLOG(2) << "i = " << i << " start = " << start
<< " tmp_len = " << tmp_len << " cursor = " << node_type
<< " cur_node_idx = " << cur_node_idx << " jump row: " << jump_rows_;
VLOG(2) << "jump_row: " << jump_rows_;
if (jump_rows_ == 0) {
node_type_start[node_type] = tmp_len + start;
cursor_ += 1;
cursor += 1;
continue;
}

Expand Down Expand Up @@ -1089,7 +1089,7 @@ int GraphDataGenerator::FillWalkBuf() {
node_type_start[node_type] = tmp_len + start;
i += jump_rows_ * walk_len_;
total_row_ += jump_rows_;
cursor_ += 1;
cursor += 1;
}
buf_state_.Reset(total_row_);
int *d_random_row = reinterpret_cast<int *>(d_random_row_->ptr());
Expand All @@ -1103,6 +1103,7 @@ int GraphDataGenerator::FillWalkBuf() {
thrust::device_pointer_cast(d_random_row),
engine);

VLOG(2) << "FillWalkBuf: " << total_row_;
cudaStreamSynchronize(sample_stream_);
shuffle_seed_ = engine();

Expand Down Expand Up @@ -1306,6 +1307,7 @@ void GraphDataGenerator::AllocResource(int thread_id,
std::vector<LoDTensor *> feed_vec) {
auto gpu_graph_ptr = GraphGpuWrapper::GetInstance();
gpuid_ = gpu_graph_ptr->device_id_mapping[thread_id];
thread_id_ = thread_id;
place_ = platform::CUDAPlace(gpuid_);

platform::CUDADeviceGuard guard(gpuid_);
Expand Down
1 change: 1 addition & 0 deletions paddle/fluid/framework/data_feed.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,7 @@ class GraphDataGenerator {
// size_t device_key_size_;
// point to device_keys_
size_t cursor_;
int thread_id_;
size_t jump_rows_;
int64_t* id_tensor_ptr_;
int64_t* show_tensor_ptr_;
Expand Down
3 changes: 2 additions & 1 deletion paddle/fluid/framework/fleet/heter_ps/graph_gpu_wrapper.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ void GraphGpuWrapper::init_conf(const std::string &first_node_type,
node_type_start[iter->second] = 0;
infer_node_type_start[iter->second] = 0;
}
infer_cursor_.push_back(0);
cursor_.push_back(0);
}
infer_cursor_ = 0;
init_type_keys();
}
}
Expand Down
3 changes: 2 additions & 1 deletion paddle/fluid/framework/fleet/heter_ps/graph_gpu_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ class GraphGpuWrapper {
std::vector<std::set<int>> finish_node_type_;
std::vector<std::unordered_map<int, size_t>> node_type_start_;
std::vector<std::unordered_map<int, size_t>> global_infer_node_type_start_;
size_t infer_cursor_;
std::vector<size_t> infer_cursor_;
std::vector<size_t> cursor_;
std::vector<std::vector<std::shared_ptr<phi::Allocation>>>
d_graph_all_type_total_keys_;
std::vector<std::vector<uint64_t>> h_graph_all_type_keys_len_;
Expand Down