Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ranking utils to threading utils. (#8785)

Browse Source
This commit is contained in:
Jiaming Yuan 2023-02-12 05:41:18 +08:00 committed by GitHub
parent 70c9b885ef
commit 17b709acb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/ranking_utils.cuh → src/common/threading_utils.cuh
View File

@ -1,13 +1,17 @@
/*! /**
* Copyright 2021 by XGBoost Contributors * Copyright 2021-2023 by XGBoost Contributors
*/ */
#ifndef XGBOOST_COMMON_RANKING_UTILS_H_ #ifndef XGBOOST_COMMON_THREADING_UTILS_CUH_
#define XGBOOST_COMMON_RANKING_UTILS_H_ #define XGBOOST_COMMON_THREADING_UTILS_CUH_
#include <cub/cub.cuh> #include <algorithm> // std::min
#include "xgboost/base.h" #include <cstddef> // std::size_t
#include "device_helpers.cuh"
#include "./math.h" #include "./math.h" // Sqr
#include "common.h"
#include "device_helpers.cuh" // LaunchN
#include "xgboost/base.h" // XGBOOST_DEVICE
#include "xgboost/span.h" // Span
namespace xgboost { namespace xgboost {
namespace common { namespace common {
@ -15,10 +19,10 @@ namespace common {
* \param n Number of items (length of the base) * \param n Number of items (length of the base)
* \param h hight * \param h hight
*/ */
XGBOOST_DEVICE inline size_t DiscreteTrapezoidArea(size_t n, size_t h) { XGBOOST_DEVICE inline std::size_t DiscreteTrapezoidArea(std::size_t n, std::size_t h) {
n -= 1; // without diagonal entries n -= 1; // without diagonal entries
h = std::min(n, h); // Specific for ranking. h = std::min(n, h); // Used for ranking, h <= n
size_t total = ((n - (h - 1)) + n) * h / 2; std::size_t total = ((n - (h - 1)) + n) * h / 2;
return total; return total;
} }
@ -29,12 +33,14 @@ XGBOOST_DEVICE inline size_t DiscreteTrapezoidArea(size_t n, size_t h) {
* Equivalent to loops like: * Equivalent to loops like:
* *
* \code * \code
* for (size i = 0; i < h; ++i) { * for (std::size_t i = 0; i < h; ++i) {
* for (size_t j = i + 1; j < n; ++j) { * for (std::size_t j = i + 1; j < n; ++j) {
* do_something(); * do_something();
* } * }
* } * }
* \endcode * \endcode
*
* with h <= n
*/ */
template <typename U> template <typename U>
inline size_t inline size_t
@ -79,6 +85,6 @@ XGBOOST_DEVICE inline void UnravelTrapeziodIdx(size_t i_idx, size_t n,
j = idx - n_elems + i + 1; j = idx - n_elems + i + 1;
} }
} // namespace common } // namespace common
} // namespace xgboost } // namespace xgboost
#endif // XGBOOST_COMMON_RANKING_UTILS_H_ #endif // XGBOOST_COMMON_THREADING_UTILS_CUH_

4
src/metric/auc.cu
View File

@ -12,8 +12,8 @@
#include <utility> #include <utility>
#include "../collective/device_communicator.cuh" #include "../collective/device_communicator.cuh"
#include "../common/optional_weight.h" // OptionalWeights #include "../common/optional_weight.h" // OptionalWeights
#include "../common/ranking_utils.cuh" #include "../common/threading_utils.cuh" // UnravelTrapeziodIdx,SegmentedTrapezoidThreads
#include "auc.h" #include "auc.h"
#include "xgboost/data.h" #include "xgboost/data.h"
#include "xgboost/span.h" #include "xgboost/span.h"

7
tests/cpp/common/test_ranking_utils.cu → tests/cpp/common/test_threading_utils.cu
View File

@ -1,13 +1,14 @@
/** /**
* Copyright 2021 by XGBoost Contributors * Copyright 2021-2023 by XGBoost Contributors
*/ */
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "../../../src/common/ranking_utils.cuh" #include <thrust/copy.h> // thrust::copy
#include "../../../src/common/device_helpers.cuh" #include "../../../src/common/device_helpers.cuh"
#include "../../../src/common/threading_utils.cuh"
namespace xgboost { namespace xgboost {
namespace common { namespace common {
TEST(SegmentedTrapezoidThreads, Basic) { TEST(SegmentedTrapezoidThreads, Basic) {
size_t constexpr kElements = 24, kGroups = 3; size_t constexpr kElements = 24, kGroups = 3;
dh::device_vector<size_t> offset_ptr(kGroups + 1, 0); dh::device_vector<size_t> offset_ptr(kGroups + 1, 0);