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

Merge branch 'master' of https://github.com/tqchen/xgboost

Browse Source 
Initial development of R pacakge and merge with the modification from tqchen.
This commit is contained in:
hetong 2014-08-26 09:57:38 -07:00
commit d9f363632a
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -35,3 +35,4 @@ Debug
*suo *suo
*test* *test*
.Rhistory .Rhistory
*.dll

2
R-package/src/xgboost_R.cpp
View File

@ -213,7 +213,7 @@ extern "C" {
&olen); &olen);
FILE *fo = utils::FopenCheck(CHAR(asChar(fname)), "w"); FILE *fo = utils::FopenCheck(CHAR(asChar(fname)), "w");
for (size_t i = 0; i < olen; ++i) { for (size_t i = 0; i < olen; ++i) {
fprintf(fo, "booster[%lu]:\n", i); fprintf(fo, "booster[%u]:\n", static_cast<unsigned>(i));
fprintf(fo, "%s", res[i]); fprintf(fo, "%s", res[i]);
} }
fclose(fo); fclose(fo);

4
src/utils/omp.h
View File

@ -10,7 +10,9 @@
#else #else
#ifndef DISABLE_OPENMP #ifndef DISABLE_OPENMP
#ifndef _MSC_VER #ifndef _MSC_VER
#warning "OpenMP is not available, compile to single thread code" #warning "OpenMP is not available, compile to single thread code."\
"You may want to ungrade your compiler to enable OpenMP support,"\
"to get benefit of multi-threading."
#else #else
// TODO add warning for msvc // TODO add warning for msvc
#endif #endif

11
src/utils/random.h
View File

@ -89,16 +89,19 @@ struct Random{
/*! \brief set random number seed */ /*! \brief set random number seed */
inline void Seed(unsigned sd) { inline void Seed(unsigned sd) {
this->rseed = sd; this->rseed = sd;
#ifdef _MSC_VER #if defined(_MSC_VER)||defined(_WIN32)
srand(rseed); srand(rseed);
#endif #endif
} }
/*! \brief return a real number uniform in [0,1) */ /*! \brief return a real number uniform in [0,1) */
inline double RandDouble(void) { inline double RandDouble(void) {
#ifndef _MSC_VER // use rand instead of rand_r in windows, for MSVC it is fine since rand is threadsafe
return static_cast<double>(rand_r(&rseed)) / (static_cast<double>(RAND_MAX) + 1.0); // For cygwin and mingw, this can slows down parallelism, but rand_r is only used in objective-inl.hpp, won't affect speed in general
#else // todo, replace with another PRNG
#if defined(_MSC_VER)||defined(_WIN32)
return static_cast<double>(rand()) / (static_cast<double>(RAND_MAX) + 1.0); return static_cast<double>(rand()) / (static_cast<double>(RAND_MAX) + 1.0);
#else
return static_cast<double>(rand_r(&rseed)) / (static_cast<double>(RAND_MAX) + 1.0);
#endif #endif
} }
// random number seed // random number seed