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

Workaround isnan across different environments. (#4883)

Browse Source
This commit is contained in:
Jiaming Yuan 2019-09-23 21:34:27 -04:00 committed by GitHub
parent c7416002e9
commit a40b72d127
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/math.h
View File

@ -132,11 +132,6 @@ inline static bool CmpSecond(const std::pair<float, unsigned> &a,
return a.second > b.second; return a.second > b.second;
} }
#if XGBOOST_STRICT_R_MODE
// check nan
bool CheckNAN(double v);
#else
// Redefined here to workaround a VC bug that doesn't support overloadng for integer // Redefined here to workaround a VC bug that doesn't support overloadng for integer
// types. // types.
template <typename T> template <typename T>
@ -146,26 +141,29 @@ CheckNAN(T) {
return false; return false;
} }
#if XGBOOST_STRICT_R_MODE && !defined(__CUDA_ARCH__)
bool CheckNAN(double v);
#else
XGBOOST_DEVICE bool inline CheckNAN(float x) { XGBOOST_DEVICE bool inline CheckNAN(float x) {
#if (defined(_WIN32) || defined(__CUDA_ARCH__)) && \ #if defined(__CUDA_ARCH__)
!defined(__MINGW64__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
return isnan(x); return isnan(x);
#else #else
return std::isnan(x); return std::isnan(x);
#endif // has c++11 std::isnan #endif // defined(__CUDA_ARCH__)
} }
XGBOOST_DEVICE bool inline CheckNAN(double x) { XGBOOST_DEVICE bool inline CheckNAN(double x) {
#if (defined(_WIN32) || defined(__CUDA_ARCH__)) && \ #if defined(__CUDA_ARCH__)
!defined(__MINGW64__) && !defined(__MINGW32__) && !defined(__CYGWIN__)
return isnan(x); return isnan(x);
#else #else
return std::isnan(x); return std::isnan(x);
#endif // has c++11 std::isnan #endif // defined(__CUDA_ARCH__)
} }
#endif // XGBOOST_STRICT_R_MODE_ #endif // XGBOOST_STRICT_R_MODE && !defined(__CUDA_ARCH__)
// GPU version is not uploaded in CRAN anyway. // GPU version is not uploaded in CRAN anyway.
// Specialize only when using R with CPU. // Specialize only when using R with CPU.
#if XGBOOST_STRICT_R_MODE && !defined(XGBOOST_USE_CUDA) #if XGBOOST_STRICT_R_MODE && !defined(XGBOOST_USE_CUDA)