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

fix solaris

Browse Source
This commit is contained in:
tqchen 2015-03-03 13:16:20 -08:00
parent 3897b7bf99
commit e50fa9e78f
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/io/io.cpp
View File

@ -15,7 +15,7 @@
namespace xgboost { namespace xgboost {
namespace io { namespace io {
DataMatrix* LoadDataMatrix(const char *fname, bool silent, bool savebuffer) { DataMatrix* LoadDataMatrix(const char *fname, bool silent, bool savebuffer) {
if (!strcmp(fname, "stdin")) { if (!std::strcmp(fname, "stdin")) {
DMatrixSimple *dmat = new DMatrixSimple(); DMatrixSimple *dmat = new DMatrixSimple();
dmat->LoadText(fname, silent); dmat->LoadText(fname, silent);
return dmat; return dmat;

5
src/tree/updater_colmaker-inl.hpp
View File

@ -6,6 +6,7 @@
* \author Tianqi Chen * \author Tianqi Chen
*/ */
#include <vector> #include <vector>
#include <cmath>
#include <algorithm> #include <algorithm>
#include "./param.h" #include "./param.h"
#include "./updater.h" #include "./updater.h"
@ -279,7 +280,7 @@ class ColMaker: public IUpdater {
ThreadEntry &e = stemp[tid][nid]; ThreadEntry &e = stemp[tid][nid];
float fsplit; float fsplit;
if (tid != 0) { if (tid != 0) {
if(fabsf(stemp[tid - 1][nid].last_fvalue - e.first_fvalue) > rt_2eps) { if(std::abs(stemp[tid - 1][nid].last_fvalue - e.first_fvalue) > rt_2eps) {
fsplit = (stemp[tid - 1][nid].last_fvalue - e.first_fvalue) * 0.5f; fsplit = (stemp[tid - 1][nid].last_fvalue - e.first_fvalue) * 0.5f;
} else { } else {
continue; continue;
@ -334,7 +335,7 @@ class ColMaker: public IUpdater {
e.first_fvalue = fvalue; e.first_fvalue = fvalue;
} else { } else {
// forward default right // forward default right
if (fabsf(fvalue - e.first_fvalue) > rt_2eps){ if (std::abs(fvalue - e.first_fvalue) > rt_2eps){
if (need_forward) { if (need_forward) {
c.SetSubstract(snode[nid].stats, e.stats); c.SetSubstract(snode[nid].stats, e.stats);
if (c.sum_hess >= param.min_child_weight && e.stats.sum_hess >= param.min_child_weight) { if (c.sum_hess >= param.min_child_weight && e.stats.sum_hess >= param.min_child_weight) {

12
src/utils/io.h
View File

@ -110,7 +110,7 @@ struct MemoryFixSizeBuffer : public ISeekStream {
utils::Assert(curr_ptr_ + size <= buffer_size_, utils::Assert(curr_ptr_ + size <= buffer_size_,
"read can not have position excceed buffer length"); "read can not have position excceed buffer length");
size_t nread = std::min(buffer_size_ - curr_ptr_, size); size_t nread = std::min(buffer_size_ - curr_ptr_, size);
if (nread != 0) memcpy(ptr, p_buffer_ + curr_ptr_, nread); if (nread != 0) std::memcpy(ptr, p_buffer_ + curr_ptr_, nread);
curr_ptr_ += nread; curr_ptr_ += nread;
return nread; return nread;
} }
@ -118,7 +118,7 @@ struct MemoryFixSizeBuffer : public ISeekStream {
if (size == 0) return; if (size == 0) return;
utils::Assert(curr_ptr_ + size <= buffer_size_, utils::Assert(curr_ptr_ + size <= buffer_size_,
"write position exceed fixed buffer size"); "write position exceed fixed buffer size");
memcpy(p_buffer_ + curr_ptr_, ptr, size); std::memcpy(p_buffer_ + curr_ptr_, ptr, size);
curr_ptr_ += size; curr_ptr_ += size;
} }
virtual void Seek(size_t pos) { virtual void Seek(size_t pos) {
@ -149,7 +149,7 @@ struct MemoryBufferStream : public ISeekStream {
utils::Assert(curr_ptr_ <= p_buffer_->length(), utils::Assert(curr_ptr_ <= p_buffer_->length(),
"read can not have position excceed buffer length"); "read can not have position excceed buffer length");
size_t nread = std::min(p_buffer_->length() - curr_ptr_, size); size_t nread = std::min(p_buffer_->length() - curr_ptr_, size);
if (nread != 0) memcpy(ptr, &(*p_buffer_)[0] + curr_ptr_, nread); if (nread != 0) std::memcpy(ptr, &(*p_buffer_)[0] + curr_ptr_, nread);
curr_ptr_ += nread; curr_ptr_ += nread;
return nread; return nread;
} }
@ -158,7 +158,7 @@ struct MemoryBufferStream : public ISeekStream {
if (curr_ptr_ + size > p_buffer_->length()) { if (curr_ptr_ + size > p_buffer_->length()) {
p_buffer_->resize(curr_ptr_+size); p_buffer_->resize(curr_ptr_+size);
} }
memcpy(&(*p_buffer_)[0] + curr_ptr_, ptr, size); std::memcpy(&(*p_buffer_)[0] + curr_ptr_, ptr, size);
curr_ptr_ += size; curr_ptr_ += size;
} }
virtual void Seek(size_t pos) { virtual void Seek(size_t pos) {
@ -178,7 +178,7 @@ struct MemoryBufferStream : public ISeekStream {
/*! \brief implementation of file i/o stream */ /*! \brief implementation of file i/o stream */
class FileStream : public ISeekStream { class FileStream : public ISeekStream {
public: public:
explicit FileStream(FILE *fp) : fp(fp) {} explicit FileStream(std::FILE *fp) : fp(fp) {}
explicit FileStream(void) { explicit FileStream(void) {
this->fp = NULL; this->fp = NULL;
} }
@ -201,7 +201,7 @@ class FileStream : public ISeekStream {
} }
private: private:
FILE *fp; std::FILE *fp;
}; };
} // namespace utils } // namespace utils
} // namespace xgboost } // namespace xgboost