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

Merge pull request #14 from dmlc/hjk41

Browse Source 
add kLongLong and kULongLong
This commit is contained in:
Tianqi Chen 2015-05-20 05:38:01 +02:00
commit 9520b90c4f
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rabit/engine.h
View File

@ -183,7 +183,9 @@ enum DataType {
kLong = 4, kLong = 4,
kULong = 5, kULong = 5,
kFloat = 6, kFloat = 6,
kDouble = 7 kDouble = 7,
kLongLong = 8,
kULongLong = 9
}; };
} // namespace mpi } // namespace mpi
/*! /*!

10
include/rabit/rabit-inl.h
View File

@ -30,7 +30,7 @@ inline DataType GetType<int>(void) {
return kInt; return kInt;
} }
template<> template<>
inline DataType GetType<unsigned>(void) { inline DataType GetType<unsigned int>(void) {
return kUInt; return kUInt;
} }
template<> template<>
@ -49,6 +49,14 @@ template<>
inline DataType GetType<double>(void) { inline DataType GetType<double>(void) {
return kDouble; return kDouble;
} }
template<>
inline DataType GetType<long long>(void) {
return kLongLong;
}
template<>
inline DataType GetType<unsigned long long>(void) {
return kULongLong;
}
} // namespace mpi } // namespace mpi
} // namespace engine } // namespace engine

2
src/engine_mpi.cc
View File

@ -110,6 +110,8 @@ inline MPI::Datatype GetType(mpi::DataType dtype) {
case kULong: return MPI::UNSIGNED_LONG; case kULong: return MPI::UNSIGNED_LONG;
case kFloat: return MPI::FLOAT; case kFloat: return MPI::FLOAT;
case kDouble: return MPI::DOUBLE; case kDouble: return MPI::DOUBLE;
case kLongLong: return MPI::LONG_LONG;
case kULongLong: return MPI::UNSIGNED_LONG_LONG;
} }
utils::Error("unknown mpi::DataType"); utils::Error("unknown mpi::DataType");
return MPI::CHAR; return MPI::CHAR;