Fix merge conflict. (#7577)

This commit is contained in:
Jiaming Yuan 2022-01-18 23:01:34 +08:00 committed by GitHub
parent cc06fab9a7
commit bb56bb9a13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -247,7 +247,7 @@ struct QuantileAllreduce {
* \brief Merge all categories from other workers.
*/
void AllreduceCategories(Span<FeatureType const> feature_types, int32_t n_threads,
std::vector<std::set<bst_cat_t>> *p_categories) {
std::vector<std::set<float>> *p_categories) {
auto &categories = *p_categories;
auto world_size = rabit::GetWorldSize();
auto rank = rabit::GetRank();