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

Avoid std::terminate for R package. (#7661)

Browse Source 
This is part of CRAN policies.
This commit is contained in:
Jiaming Yuan 2022-02-17 01:27:20 +08:00 committed by GitHub
parent 12949c6b31
commit 711f7f3851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/xgboost/span.h
View File

@ -102,13 +102,27 @@ namespace common {
#define SPAN_CHECK KERNEL_CHECK #define SPAN_CHECK KERNEL_CHECK
#else // not CUDA #else // ------------------------------ not CUDA ----------------------------
#define KERNEL_CHECK(cond) \ #if defined(XGBOOST_STRICT_R_MODE) && XGBOOST_STRICT_R_MODE == 1
(XGBOOST_EXPECT((cond), true) ? static_cast<void>(0) : std::terminate())
#define KERNEL_CHECK(cond) \
do { \
if (XGBOOST_EXPECT(!(cond), false)) { \
printf("[xgboost] fatal error.\n"); \
} \
} while (0)
#define SPAN_CHECK(cond) KERNEL_CHECK(cond) #define SPAN_CHECK(cond) KERNEL_CHECK(cond)
#else
#define KERNEL_CHECK(cond) (XGBOOST_EXPECT((cond), true) ? static_cast<void>(0) : std::terminate())
#define SPAN_CHECK(cond) KERNEL_CHECK(cond)
#endif // defined(XGBOOST_STRICT_R_MODE)
#endif // __CUDA_ARCH__ #endif // __CUDA_ARCH__
#if defined(__CUDA_ARCH__) #if defined(__CUDA_ARCH__)

3
src/tree/hist/evaluate_splits.h
View File

@ -114,9 +114,6 @@ template <typename GradientSumT, typename ExpandEntry> class HistEvaluator {
left_sum.SetSubstract(parent.stats, right_sum); left_sum.SetSubstract(parent.stats, right_sum);
break; break;
} }
default: {
std::terminate();
}
} }
}; };