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

Fix calculation of number of bins in FindGroup #6019

Merged
merged 8 commits into from
Feb 20, 2024
Merged

Fix calculation of number of bins in FindGroup #6019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
321ce4a
solve 'bin size 257 cannot run on GPU #3339'
CVPaul Aug 4, 2023
7bdb2fb
fix typo LeafIndex -> leaf_index
CVPaul Aug 4, 2023
df27f46
Merge branch 'master' into solve-issue-3339
shiyu1994 Aug 15, 2023
4d9fd7a
Merge branch 'master' into solve-issue-3339
shiyu1994 Sep 12, 2023
f684058
Merge branch 'master' into solve-issue-3339
jameslamb Nov 6, 2023
fa57326
Merge branch 'master' into solve-issue-3339
shiyu1994 Feb 8, 2024
31a4778
Merge branch 'master' into solve-issue-3339
jameslamb Feb 13, 2024
2822387
Merge branch 'master' into solve-issue-3339
jameslamb Feb 20, 2024
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 src/io/dataset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ std::vector<std::vector<int>> FindGroups(
std::vector<int> available_groups;
for (int gid = 0; gid < static_cast<int>(features_in_group.size()); ++gid) {
auto cur_num_bin = group_num_bin[gid] + bin_mappers[fidx]->num_bin() +
(bin_mappers[fidx]->GetDefaultBin() == 0 ? -1 : 0);
(bin_mappers[fidx]->GetMostFreqBin() == 0 ? -1 : 0);
if (group_total_data_cnt[gid] + cur_non_zero_cnt <=
total_sample_cnt + single_val_max_conflict_cnt) {
if (!is_use_gpu || cur_num_bin <= max_bin_per_group) {
Expand Down Expand Up @@ -189,7 +189,7 @@ std::vector<std::vector<int>> FindGroups(
group_used_row_cnt.emplace_back(cur_non_zero_cnt);
group_num_bin.push_back(
1 + bin_mappers[fidx]->num_bin() +
(bin_mappers[fidx]->GetDefaultBin() == 0 ? -1 : 0));
(bin_mappers[fidx]->GetMostFreqBin() == 0 ? -1 : 0));
}
}
if (!is_sparse) {
Expand Down
2 changes: 1 addition & 1 deletion src/treelearner/gpu_tree_learner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ void GPUTreeLearner::FindBestSplits(const Tree* tree) {
size_t bin_size = train_data_->FeatureNumBin(feature_index) + 1;
printf("Feature %d smaller leaf:\n", feature_index);
PrintHistograms(smaller_leaf_histogram_array_[feature_index].RawData() - kHistOffset, bin_size);
if (larger_leaf_splits_ == nullptr || larger_leaf_splits_->LeafIndex() < 0) { continue; }
if (larger_leaf_splits_ == nullptr || larger_leaf_splits_->leaf_index() < 0) { continue; }
printf("Feature %d larger leaf:\n", feature_index);
PrintHistograms(larger_leaf_histogram_array_[feature_index].RawData() - kHistOffset, bin_size);
}
Expand Down
Loading