lint and travis

include/rabit/io.h

@@ -4,8 +4,8 @@
  * \brief utilities with different serializable implementations
  * \author Tianqi Chen
  */
-#ifndef RABIT_UTILS_IO_H_
-#define RABIT_UTILS_IO_H_
+#ifndef RABIT_IO_H_
+#define RABIT_IO_H_
 #include <cstdio>
 #include <vector>
 #include <cstring>
@@ -51,6 +51,7 @@ struct MemoryFixSizeBuffer : public SeekStream {
   virtual bool AtEnd(void) const {
     return curr_ptr_ == buffer_size_;
   }
+
  private:
   /*! \brief in memory buffer */
   char *p_buffer_;
@@ -93,6 +94,7 @@ struct MemoryBufferStream : public SeekStream {
   virtual bool AtEnd(void) const {
     return curr_ptr_ == p_buffer_->length();
   }
+
  private:
   /*! \brief in memory buffer */
   std::string *p_buffer_;
@@ -101,4 +103,4 @@ struct MemoryBufferStream : public SeekStream {
 };  // class MemoryBufferStream
 }  // namespace utils
 }  // namespace rabit
-#endif  // RABIT_UTILS_IO_H_
+#endif  // RABIT_IO_H_

include/rabit/rabit-inl.h

@@ -1,12 +1,15 @@
 /*!
+ * Copyright by Contributors
  * \file rabit-inl.h
  * \brief implementation of inline template function for rabit interface
  *
  * \author Tianqi Chen
  */
-#ifndef RABIT_RABIT_INL_H
-#define RABIT_RABIT_INL_H
+#ifndef RABIT_RABIT_INL_H_
+#define RABIT_RABIT_INL_H_
 // use engine for implementation
+#include <vector>
+#include <string>
 #include "./io.h"
 #include "./utils.h"
 #include "../rabit.h"
@@ -30,15 +33,15 @@ inline DataType GetType<int>(void) {
   return kInt;
 }
 template<>
-inline DataType GetType<unsigned int>(void) {
+inline DataType GetType<unsigned int>(void) { // NOLINT(*)
   return kUInt;
 }
 template<>
-inline DataType GetType<long>(void) {
+inline DataType GetType<long>(void) {  // NOLINT(*)
   return kLong;
 }
 template<>
-inline DataType GetType<unsigned long>(void) {
+inline DataType GetType<unsigned long>(void) { // NOLINT(*)
   return kULong;
 }
 template<>
@@ -50,54 +53,54 @@ inline DataType GetType<double>(void) {
   return kDouble;
 }
 template<>
-inline DataType GetType<long long>(void) {
-	return kLongLong;
+inline DataType GetType<long long>(void) { // NOLINT(*)
+  return kLongLong;
 }
 template<>
-inline DataType GetType<unsigned long long>(void) {
-	return kULongLong;
+inline DataType GetType<unsigned long long>(void) { // NOLINT(*)
+  return kULongLong;
 }
 }  // namespace mpi
 }  // namespace engine
 
 namespace op {
 struct Max {
-  const static engine::mpi::OpType kType = engine::mpi::kMax;
+  static const engine::mpi::OpType kType = engine::mpi::kMax;
   template<typename DType>
-  inline static void Reduce(DType &dst, const DType &src) {
+  inline static void Reduce(DType &dst, const DType &src) { // NOLINT(*)
     if (dst < src) dst = src;
   }
 };
 struct Min {
-  const static engine::mpi::OpType kType = engine::mpi::kMin;
+  static const engine::mpi::OpType kType = engine::mpi::kMin;
   template<typename DType>
-  inline static void Reduce(DType &dst, const DType &src) {
+  inline static void Reduce(DType &dst, const DType &src) { // NOLINT(*)
     if (dst > src) dst = src;
   }
 };
 struct Sum {
-  const static engine::mpi::OpType kType = engine::mpi::kSum;
+  static const engine::mpi::OpType kType = engine::mpi::kSum;
   template<typename DType>
-  inline static void Reduce(DType &dst, const DType &src) {
+  inline static void Reduce(DType &dst, const DType &src) { // NOLINT(*)
     dst += src;
   }
 };
 struct BitOR {
-  const static engine::mpi::OpType kType = engine::mpi::kBitwiseOR;
+  static const engine::mpi::OpType kType = engine::mpi::kBitwiseOR;
   template<typename DType>
-  inline static void Reduce(DType &dst, const DType &src) {
+  inline static void Reduce(DType &dst, const DType &src) { // NOLINT(*)
     dst |= src;
   }
 };
 template<typename OP, typename DType>
 inline void Reducer(const void *src_, void *dst_, int len, const MPI::Datatype &dtype) {
   const DType *src = (const DType*)src_;
-  DType *dst = (DType*)dst_;  
+  DType *dst = (DType*)dst_;  // NOLINT(*)
   for (int i = 0; i < len; ++i) {
     OP::Reduce(dst[i], src[i]);
   }
 }
-} // namespace op
+}  // namespace op
 
 // intialize the rabit engine
 inline void Init(int argc, char *argv[]) {
@@ -152,23 +155,23 @@ inline void Broadcast(std::string *sendrecv_data, int root) {
 // perform inplace Allreduce
 template<typename OP, typename DType>
 inline void Allreduce(DType *sendrecvbuf, size_t count,
-                      void (*prepare_fun)(void *arg), 
+                      void (*prepare_fun)(void *arg),
                       void *prepare_arg) {
-  engine::Allreduce_(sendrecvbuf, sizeof(DType), count, op::Reducer<OP,DType>,
+  engine::Allreduce_(sendrecvbuf, sizeof(DType), count, op::Reducer<OP, DType>,
                      engine::mpi::GetType<DType>(), OP::kType, prepare_fun, prepare_arg);
 }
 
 // C++11 support for lambda prepare function
-#if __cplusplus >= 201103L
+#if DMLC_USE_CXX11
 inline void InvokeLambda_(void *fun) {
   (*static_cast<std::function<void()>*>(fun))();
 }
 template<typename OP, typename DType>
 inline void Allreduce(DType *sendrecvbuf, size_t count, std::function<void()> prepare_fun) {
-  engine::Allreduce_(sendrecvbuf, sizeof(DType), count, op::Reducer<OP,DType>,
+  engine::Allreduce_(sendrecvbuf, sizeof(DType), count, op::Reducer<OP, DType>,
                      engine::mpi::GetType<DType>(), OP::kType, InvokeLambda_, &prepare_fun);
 }
-#endif // C++11
+#endif  // C++11
 
 // print message to the tracker
 inline void TrackerPrint(const std::string &msg) {
@@ -223,15 +226,16 @@ inline void ReducerSafe_(const void *src_, void *dst_, int len_, const MPI::Data
   }
 }
 // function to perform reduction for Reducer
-template<typename DType, void (*freduce)(DType &dst, const DType &src)>
-inline void ReducerAlign_(const void *src_, void *dst_, int len_, const MPI::Datatype &dtype) {
+template<typename DType, void (*freduce)(DType &dst, const DType &src)> // NOLINT(*)
+inline void ReducerAlign_(const void *src_, void *dst_,
+                          int len_, const MPI::Datatype &dtype) {
   const DType *psrc = reinterpret_cast<const DType*>(src_);
   DType *pdst = reinterpret_cast<DType*>(dst_);
   for (int i = 0; i < len_; ++i) {
     freduce(pdst[i], psrc[i]);
   }
 }
-template<typename DType, void (*freduce)(DType &dst, const DType &src)>
+template<typename DType, void (*freduce)(DType &dst, const DType &src)>  // NOLINT(*)
 inline Reducer<DType, freduce>::Reducer(void) {
   // it is safe to directly use handle for aligned data types
   if (sizeof(DType) == 8 || sizeof(DType) == 4 || sizeof(DType) == 1) {
@@ -240,7 +244,7 @@ inline Reducer<DType, freduce>::Reducer(void) {
     this->handle_.Init(ReducerSafe_<DType, freduce>, sizeof(DType));
   }
 }
-template<typename DType, void (*freduce)(DType &dst, const DType &src)>
+template<typename DType, void (*freduce)(DType &dst, const DType &src)> // NOLINT(*)
 inline void Reducer<DType, freduce>::Allreduce(DType *sendrecvbuf, size_t count,
                                                void (*prepare_fun)(void *arg),
                                                void *prepare_arg) {
@@ -248,13 +252,14 @@ inline void Reducer<DType, freduce>::Allreduce(DType *sendrecvbuf, size_t count,
 }
 // function to perform reduction for SerializeReducer
 template<typename DType>
-inline void SerializeReducerFunc_(const void *src_, void *dst_, int len_, const MPI::Datatype &dtype) {
+inline void SerializeReducerFunc_(const void *src_, void *dst_,
+                                  int len_, const MPI::Datatype &dtype) {
   int nbytes = engine::ReduceHandle::TypeSize(dtype);
   // temp space
   DType tsrc, tdst;
   for (int i = 0; i < len_; ++i) {
-    utils::MemoryFixSizeBuffer fsrc((char*)(src_) + i * nbytes, nbytes);
-    utils::MemoryFixSizeBuffer fdst((char*)(dst_) + i * nbytes, nbytes);
+    utils::MemoryFixSizeBuffer fsrc((char*)(src_) + i * nbytes, nbytes); // NOLINT(*)
+    utils::MemoryFixSizeBuffer fdst((char*)(dst_) + i * nbytes, nbytes); // NOLINT(*)
     tsrc.Load(fsrc);
     tdst.Load(fdst);
     // govern const check
@@ -296,8 +301,8 @@ inline void SerializeReducer<DType>::Allreduce(DType *sendrecvobj,
   // setup closure
   SerializeReduceClosure<DType> c;
   c.sendrecvobj = sendrecvobj; c.max_nbyte = max_nbyte; c.count = count;
-  c.prepare_fun = prepare_fun; c.prepare_arg = prepare_arg; c.p_buffer = &buffer_;   
-  // invoke here 
+  c.prepare_fun = prepare_fun; c.prepare_arg = prepare_arg; c.p_buffer = &buffer_;
+  // invoke here
   handle_.Allreduce(BeginPtr(buffer_), max_nbyte, count,
                     SerializeReduceClosure<DType>::Invoke, &c);
   for (size_t i = 0; i < count; ++i) {
@@ -306,8 +311,8 @@ inline void SerializeReducer<DType>::Allreduce(DType *sendrecvobj,
   }
 }
 
-#if __cplusplus >= 201103L
-template<typename DType, void (*freduce)(DType &dst, const DType &src)>
+#if DMLC_USE_CXX11
+template<typename DType, void (*freduce)(DType &dst, const DType &src)>  // NOLINT(*)g
 inline void Reducer<DType, freduce>::Allreduce(DType *sendrecvbuf, size_t count,
                                                std::function<void()> prepare_fun) {
   this->Allreduce(sendrecvbuf, count, InvokeLambda_, &prepare_fun);
@@ -320,4 +325,4 @@ inline void SerializeReducer<DType>::Allreduce(DType *sendrecvobj,
 }
 #endif
 }  // namespace rabit
-#endif
+#endif  // RABIT_RABIT_INL_H_

include/rabit/timer.h

@@ -1,4 +1,5 @@
 /*!
+ * Copyright by Contributors
  * \file timer.h
  * \brief This file defines the utils for timing
  * \author Tianqi Chen, Nacho, Tianyi
@@ -18,7 +19,6 @@ namespace utils {
  * \brief return time in seconds, not cross platform, avoid to use this in most places
  */
 inline double GetTime(void) {
-  // TODO: use c++11 chrono when c++11 was available
   #ifdef __MACH__
   clock_serv_t cclock;
   mach_timespec_t mts;
@@ -32,7 +32,6 @@ inline double GetTime(void) {
   utils::Check(clock_gettime(CLOCK_REALTIME, &ts) == 0, "failed to get time");
   return static_cast<double>(ts.tv_sec) + static_cast<double>(ts.tv_nsec) * 1e-9;
   #else
-  // TODO: add MSVC macro, and MSVC timer
   return static_cast<double>(time(NULL));
   #endif
   #endif

include/rabit/utils.h

@@ -27,7 +27,7 @@
 #else
 #ifdef _FILE_OFFSET_BITS
 #if _FILE_OFFSET_BITS == 32
-#pragma message ("Warning: FILE OFFSET BITS defined to be 32 bit")
+#pragma message("Warning: FILE OFFSET BITS defined to be 32 bit")
 #endif
 #endif
 
@@ -59,17 +59,17 @@ namespace utils {
 const int kPrintBuffer = 1 << 12;
 
 #ifndef RABIT_CUSTOMIZE_MSG_
-/*! 
+/*!
  * \brief handling of Assert error, caused by inappropriate input
- * \param msg error message 
+ * \param msg error message
  */
 inline void HandleAssertError(const char *msg) {
   fprintf(stderr, "AssertError:%s\n", msg);
   exit(-1);
 }
-/*! 
+/*!
  * \brief handling of Check error, caused by inappropriate input
- * \param msg error message 
+ * \param msg error message
  */
 inline void HandleCheckError(const char *msg) {
   fprintf(stderr, "%s\n", msg);
@@ -163,7 +163,7 @@ inline std::FILE *FopenCheck(const char *fname, const char *flag) {
 // easy utils that can be directly accessed in xgboost
 /*! \brief get the beginning address of a vector */
 template<typename T>
-inline T *BeginPtr(std::vector<T> &vec) {
+inline T *BeginPtr(std::vector<T> &vec) {  // NOLINT(*)
   if (vec.size() == 0) {
     return NULL;
   } else {
@@ -172,14 +172,14 @@ inline T *BeginPtr(std::vector<T> &vec) {
 }
 /*! \brief get the beginning address of a vector */
 template<typename T>
-inline const T *BeginPtr(const std::vector<T> &vec) {
+inline const T *BeginPtr(const std::vector<T> &vec) {  // NOLINT(*)
   if (vec.size() == 0) {
     return NULL;
   } else {
     return &vec[0];
   }
 }
-inline char* BeginPtr(std::string &str) {
+inline char* BeginPtr(std::string &str) {  // NOLINT(*)
   if (str.length() == 0) return NULL;
   return &str[0];
 }