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

Work around nvcc error. #7673

Merged
merged 6 commits into from
Feb 18, 2022
Merged

Work around nvcc error. #7673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46438fd
Work around nvcc error.
trivialfis Feb 18, 2022
614d4cc
Revert "Work around nvcc error."
trivialfis Feb 18, 2022
e7faf0f
Specialize.
trivialfis Feb 18, 2022
ac0ea83
specialize.
trivialfis Feb 18, 2022
b9cda4d
Specify all the lambda captures.
trivialfis Feb 18, 2022
ba10ea8
Revert.
trivialfis Feb 18, 2022
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
28 changes: 12 additions & 16 deletions include/xgboost/span.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,25 +81,26 @@ namespace common {
#if defined(_MSC_VER)

// Windows CUDA doesn't have __assert_fail.
#define KERNEL_CHECK(cond) \
do { \
if (XGBOOST_EXPECT(!(cond), false)) { \
asm("trap;"); \
} \
#define CUDA_KERNEL_CHECK(cond) \
do { \
if (XGBOOST_EXPECT(!(cond), false)) { \
asm("trap;"); \
} \
} while (0)

#else // defined(_MSC_VER)

#define __ASSERT_STR_HELPER(x) #x

#define KERNEL_CHECK(cond) \
(XGBOOST_EXPECT((cond), true) \
? static_cast<void>(0) \
: __assert_fail(__ASSERT_STR_HELPER((cond)), __FILE__, __LINE__, \
__PRETTY_FUNCTION__))
#define CUDA_KERNEL_CHECK(cond) \
(XGBOOST_EXPECT((cond), true) \
? static_cast<void>(0) \
: __assert_fail(__ASSERT_STR_HELPER((cond)), __FILE__, __LINE__, __PRETTY_FUNCTION__))

#endif // defined(_MSC_VER)

#define KERNEL_CHECK CUDA_KERNEL_CHECK

#define SPAN_CHECK KERNEL_CHECK

#else // ------------------------------ not CUDA ----------------------------
Expand All @@ -120,11 +121,7 @@ namespace common {

#endif // __CUDA_ARCH__

#if defined(__CUDA_ARCH__)
#define SPAN_LT(lhs, rhs) KERNEL_CHECK((lhs) < (rhs))
#else
#define SPAN_LT(lhs, rhs) KERNEL_CHECK((lhs) < (rhs))
#endif // defined(__CUDA_ARCH__)
#define SPAN_LT(lhs, rhs) SPAN_CHECK((lhs) < (rhs))

namespace detail {
/*!
Expand Down Expand Up @@ -671,7 +668,6 @@ XGBOOST_DEVICE auto as_writable_bytes(Span<T, E> s) __span_noexcept -> // NOLIN
Span<byte, detail::ExtentAsBytesValue<T, E>::value> {
return {reinterpret_cast<byte*>(s.data()), s.size_bytes()};
}

} // namespace common
} // namespace xgboost

Expand Down
3 changes: 2 additions & 1 deletion src/tree/gpu_hist/row_partitioner.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ class RowPartitioner {

int64_t* d_left_count = left_counts_.data().get() + nidx;
// Launch 1 thread for each row
dh::LaunchN<1, 128>(segment.Size(), [=] __device__(size_t idx) {
dh::LaunchN<1, 128>(segment.Size(), [segment, op, left_nidx, right_nidx, d_ridx, d_left_count,
d_position] __device__(size_t idx) {
// LaunchN starts from zero, so we restore the row index by adding segment.begin
idx += segment.begin;
RowIndexT ridx = d_ridx[idx];
Expand Down