Merge branches 'master' and 'master' of https://github.com/Microsoft/LightGBM

src/network/linkers_socket.cpp

@@ -77,7 +77,7 @@ Linkers::~Linkers() {
 }
 
 void Linkers::ParseMachineList(const char * filename) {
-  TextReader<size_t> machine_list_reader(filename);
+  TextReader<size_t> machine_list_reader(filename, false);
   machine_list_reader.ReadAllLines();
   if (machine_list_reader.Lines().size() <= 0) {
     Log::Fatal("Machine list file:%s doesn't exist", filename);

src/network/network.cpp

@@ -9,7 +9,7 @@
 
 namespace LightGBM {
 
-// static member defination
+// static member definition
 int Network::num_machines_;
 int Network::rank_;
 Linkers* Network::linkers_;
@@ -141,7 +141,7 @@ void Network::ReduceScatter(char* input, int input_size, int* block_start, int*
       // send local data to neighbor first
       linkers_->Send(recursive_halving_map_.neighbor, input, input_size);
     } else if (recursive_halving_map_.type == RecursiveHalvingNodeType::GroupLeader) {
-      // recieve neighbor data first
+      // receive neighbor data first
       int need_recv_cnt = input_size;
       linkers_->Recv(recursive_halving_map_.neighbor, output, need_recv_cnt);
       // reduce

src/network/socket_wrapper.hpp

@@ -155,7 +155,7 @@ public:
         pAdapter = pAdapter->Next;
       }
     } else {
-      Log::Error("GetAdaptersinfo error: code %d ", dwRetVal);
+      Log::Fatal("GetAdaptersinfo error: code %d ", dwRetVal);
     }
     if (pAdapterInfo)
       FREE(pAdapterInfo);

src/objective/objective_function.cpp

@@ -2,16 +2,19 @@
 #include "regression_objective.hpp"
 #include "binary_objective.hpp"
 #include "rank_objective.hpp"
+#include "multiclass_objective.hpp"
 
 namespace LightGBM {
 
 ObjectiveFunction* ObjectiveFunction::CreateObjectiveFunction(const std::string& type, const ObjectiveConfig& config) {
-  if (type == "regression") {
+  if (type == std::string("regression")) {
     return new RegressionL2loss(config);
-  } else if (type == "binary") {
+  } else if (type == std::string("binary")) {
     return new BinaryLogloss(config);
-  } else if (type == "lambdarank") {
+  } else if (type == std::string("lambdarank")) {
     return new LambdarankNDCG(config);
+  } else if (type == std::string("multiclass")) {
+    return new MulticlassLogloss(config);
   }
   return nullptr;
 }

src/treelearner/parallel_tree_learner.h

@@ -77,9 +77,9 @@ private:
   int* block_start_;
   /*! \brief Block size for reduce scatter */
   int* block_len_;
-  /*! \brief Write positions for feature histgrams */
+  /*! \brief Write positions for feature histograms */
   int* buffer_write_start_pos_;
-  /*! \brief Read positions for local feature histgrams */
+  /*! \brief Read positions for local feature histograms */
   int* buffer_read_start_pos_;
   /*! \brief Size for reduce scatter */
   int reduce_scatter_size_;